Thanks for your reply. I'm using full virtual machines within my desktop pool and not using composer. I'm also using the customisation via vSphere instead of sysprep.
I'll try with a Windows 10 sysprep image and see how that goes too. Any other suggestions welcome!