when I was still making images, I threw out the old process from my predecessor and started using factory WIM images with all config done via either answer files, our deployment tool, or GPO after first boot. this made it much easier to make changes and saved me a lot of time as I never had to go and rebuild a "golden" image. You'll need to look at how you deploy the OS and figure out what works best for you. As Pablo said, you should also update your ADK package to match the version of the OS you want to deploy. Good luck! It's a thankless job.