One golden image for different vGPU profiles

Is there a way to prevent the additional reboot of Win10 VM before GUI load when the OS detects a vGPU which is different from the one in the master/golden image? Because we have statless clones with PVS this reboot forces us to create different master images for every vGPU profile in our environment. Otherwise the VM will get in to a boot circle.

XenServer 7.1 CU1
XenDesktop 7.15 LTSR
Windows 10 1703
HP Synergy 480 Gen10 4x P6
Windows Driver 391.58
vGPU Manager 390.57


Unfortunately this seems not to work any more with latest Win10/Server2016. I currently don’t see any other solution except creating seperate master templates.