Yeah, that could be the best solution!
I will try this on all my VMs this afternoon.