diff --git a/scripts/deploy b/scripts/deploy
index f8f207223..2a4eac71f 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -2,6 +2,9 @@
 
 set -o errexit -o nounset -o pipefail
 
+: "${BOSH_VAR_azs:='[z1,z2,z3]'}"
+: "${BOSH_VAR_network:=default}"
+: "${BOSH_VAR_vm_type:=default}"
 : "${PXC_DEPLOYMENT_NAME:=pxc}"
 : "${PXC_DEPLOY_VERSION:=}"
 : "${MYSQL_VERSION:=}"
@@ -33,7 +36,12 @@ main() {
   fi
 
   if [[ ${ENABLE_CLUSTER} == "true" ]]; then
-    deploy_opts+=(--ops-file=operations/use-clustered.yml)
+    deploy_opts+=(
+      --ops-file=operations/use-clustered.yml
+      --ops-file=operations/iaas/cluster.yml
+    )
+  else
+    deploy_opts+=(--ops-file=operations/iaas/single-node.yml)
   fi
 
   if [[ "${REDACT}" == "false" ]]; then
@@ -45,6 +53,7 @@ main() {
   bosh deploy pxc-deployment.yml \
     --deployment="${deployment_name}" \
     --non-interactive \
+    --vars-env=BOSH_VAR \
     "${deploy_opts[@]}"
 }
 
diff --git a/src/e2e-tests/pxc_upgrade_test.go b/src/e2e-tests/pxc_upgrade_test.go
index fe699b3ab..38cdda039 100644
--- a/src/e2e-tests/pxc_upgrade_test.go
+++ b/src/e2e-tests/pxc_upgrade_test.go
@@ -22,13 +22,13 @@ var _ = Describe("Legacy upgrades from existing Percona XtraDB Cluster 5.7 deplo
 		By("deploying pxc-release with mysql_version=5.7")
 		Expect(bosh.Deploy(deploymentName, "src/e2e-tests/manifest/pxc-5.7.yml",
 			bosh.Var("deployment_name", deploymentName),
-			bosh.VarsEnv("PXC_TEST"),
+			bosh.VarsEnv("BOSH_VAR"),
 		)).To(Succeed())
 
 		By("upgrading to mysql_version=" + expectedMysqlVersion)
 		Expect(bosh.Deploy(deploymentName, "src/e2e-tests/manifest/pxc-5.7.yml",
 			bosh.Var("deployment_name", deploymentName),
-			bosh.VarsEnv("PXC_TEST"),
+			bosh.VarsEnv("BOSH_VAR"),
 			bosh.Operation(`mysql-version.yml`),
 			bosh.Var("mysql_version", expectedMysqlVersion),
 			bosh.Operation("dev-release.yml"),
diff --git a/src/e2e-tests/suite_test.go b/src/e2e-tests/suite_test.go
index 9a49f19b3..050dd2aad 100644
--- a/src/e2e-tests/suite_test.go
+++ b/src/e2e-tests/suite_test.go
@@ -50,21 +50,21 @@ var _ = BeforeSuite(func() {
 	}
 	Expect(missingEnvs).To(BeEmpty(), "Missing environment variables: %s", strings.Join(missingEnvs, ", "))
 
-	if _, ok := os.LookupEnv("PXC_TEST_azs"); !ok {
-		GinkgoT().Setenv("PXC_TEST_azs", "[z1,z2,z3]")
+	if _, ok := os.LookupEnv("BOSH_VAR_azs"); !ok {
+		GinkgoT().Setenv("BOSH_VAR_azs", "[z1,z2,z3]")
 	}
 
-	if _, ok := os.LookupEnv("PXC_TEST_network"); !ok {
-		GinkgoT().Setenv("PXC_TEST_network", "default")
+	if _, ok := os.LookupEnv("BOSH_VAR_network"); !ok {
+		GinkgoT().Setenv("BOSH_VAR_network", "default")
 	}
 
-	if _, ok := os.LookupEnv("PXC_TEST_vm_type"); !ok {
-		GinkgoT().Setenv("PXC_TEST_vm_type", "small")
+	if _, ok := os.LookupEnv("BOSH_VAR_vm_type"); !ok {
+		GinkgoT().Setenv("BOSH_VAR_vm_type", "small")
 	}
 
-	GinkgoWriter.Println("Using PXC_TEST_azs=" + os.Getenv("PXC_TEST_azs"))
-	GinkgoWriter.Println("Using PXC_TEST_network=" + os.Getenv("PXC_TEST_network"))
-	GinkgoWriter.Println("Using PXC_TEST_vm_type=" + os.Getenv("PXC_TEST_vm_type"))
+	GinkgoWriter.Println("Using BOSH_VAR_azs=" + os.Getenv("BOSH_VAR_azs"))
+	GinkgoWriter.Println("Using BOSH_VAR_network=" + os.Getenv("BOSH_VAR_network"))
+	GinkgoWriter.Println("Using BOSH_VAR_vm_type=" + os.Getenv("BOSH_VAR_vm_type"))
 
 	if proxySpec := os.Getenv("BOSH_ALL_PROXY"); proxySpec != "" {
 		var err error
diff --git a/src/e2e-tests/utilities/bosh/bosh.go b/src/e2e-tests/utilities/bosh/bosh.go
index b07f1056d..264b3ac33 100644
--- a/src/e2e-tests/utilities/bosh/bosh.go
+++ b/src/e2e-tests/utilities/bosh/bosh.go
@@ -123,7 +123,7 @@ func DeployPXC(deploymentName string, options ...DeployOptionFunc) error {
 		"pxc-deployment.yml",
 		"--ops-file=operations/deployment-name.yml",
 		"--var=deployment_name=" + deploymentName,
-		"--vars-env=PXC_TEST",
+		"--vars-env=BOSH_VAR",
 	}
 
 	if pxcVersion := os.Getenv("PXC_DEPLOY_VERSION"); pxcVersion != "" {
@@ -173,7 +173,7 @@ func Var(key, value string) DeployOptionFunc {
 
 // VarsEnv is a helper method to read bosh variables from the environment
 // Syntactic sugar for bosh deploy --vars-env=$prefix
-// Example VarsEnv("PXC_TEST") will resolve variables by looking up PXC_TEST_${var_name}
+// Example VarsEnv("BOSH_VAR") will resolve variables by looking up BOSH_VAR_${var_name}
 func VarsEnv(prefix string) DeployOptionFunc {
 	return func(args *[]string) {
 		*args = append(*args, "--vars-env="+prefix)