port infra vms to use new framework