Fixes for master Jenkins manifest after testing on VMs