Is there a specific reason for installing the Agent into the image? I generally advise against putting any software into your images. That's why we have PDQ, right?
I baked a bunch of software into my images because I was originally hired to assist with a hardware refresh but the only endpoint management software they had was LogMeIn and a sad WDS server. Had to create images and deploy hardware immediately and didn't have time to build out and learn a new software deployment system so I just baked in everything a standard user could possibly use. 4 years later I still havent updated the images (haha) and just use Deploy to uninstall all the baked in crap, creating a software baseline, before installing only the software that user needs.