Fix an issue with VM's getting created twice during build