Control - Image Deployment Update for Windows 10 VMs

I follow this instruction as I have always for RDS or TS image deployment using Citrix MCS:

https://docs.connectwise.com/ConnectWise_Control_Documentation/Get_started/Knowledge_base/Image_a_machine_with_an_installed_agent

With Windows 10 deployment, I remove the same information from the registry but it doesn't seem to work, not for the master servers at least. I am finding I have to reinstall or just access via RDS. The new machines, when they deploy, appear to have the Control app working and no duplicates happen on next wipe and reload.