diff --git a/magefile.go b/magefile.go
index 759ccd769..37898a109 100644
--- a/magefile.go
+++ b/magefile.go
@@ -137,14 +137,14 @@ func RunE2e(buildOS, buildConfig, buildInfra string, dryRun bool) error {
 		}
 	}
 
-	if buildOS == "flatcar" || buildOS == "ubuntu 20.04" && buildInfra == ova {
-		flatcarOverride := "packer-ova-flatcar-override.yaml"
-		flatcarOverrideFlag := fmt.Sprintf("--overrides=%s", flatcarOverride)
-		overrideFlagForCmd = append(overrideFlagForCmd, flatcarOverrideFlag)
-		fmt.Printf("making flatcar/ubuntu override %s \n", flatcarOverride)
+	if buildConfig == basic && buildInfra == ova {
+		basicOverride := "packer-ova-basic-override.yaml"
+		basicOverrideFlag := fmt.Sprintf("--overrides=%s", basicOverride)
+		overrideFlagForCmd = append(overrideFlagForCmd, basicOverrideFlag)
+		fmt.Printf("making basic override %s \n", basicOverride)
 		// TODO: @faiq - move this to mage
-		if err := sh.RunV("make", flatcarOverride); err != nil {
-			return fmt.Errorf("failed to override for flatcar ova %s %v", flatcarOverride, err)
+		if err := sh.RunV("make", basicOverride); err != nil {
+			return fmt.Errorf("failed to override for basic ova %s %v", basicOverride, err)
 		}
 	}
 
@@ -411,7 +411,6 @@ func createOSBundle(osName, kubernetesVersion, downloadDir string, fips, gpu boo
 	}
 	if osName == "redhat 8.8" || osName == "redhat 8.6" {
 		args = append(args, "--enable-eus-repos=true")
-
 	}
 	if gpu {
 		args = append(args, "--fetch-kernel-headers=true")
diff --git a/test/infra/Makefile b/test/infra/Makefile
index 9f796a3bd..c469e8e0c 100644
--- a/test/infra/Makefile
+++ b/test/infra/Makefile
@@ -77,8 +77,8 @@ packer-aws-offline-override.yaml: infra.aws.create install-envsubst
 packer-ova-offline-override.yaml: infra.vsphere.create install-envsubst
 	@$(INFRA_MODULES_DIR)/vsphere/export.sh $@
 
-packer-ova-flatcar-override.yaml: install-envsubst
-	"${ENVSUBST_ASSETS}"/envsubst < "$(INFRA_MODULES_DIR)"/vsphere/packer-vsphere-flatcar.yaml.tmpl > $@
+packer-ova-basic-override.yaml: install-envsubst
+	"${ENVSUBST_ASSETS}"/envsubst < "$(INFRA_MODULES_DIR)"/vsphere/packer-vsphere-basic.yaml.tmpl > $@
 
 .PHONY: infra.aws.destroy
 infra.aws.destroy: ## Destroy infrastructure
diff --git a/test/infra/vsphere/packer-vsphere-flatcar.yaml.tmpl b/test/infra/vsphere/packer-vsphere-basic.yaml.tmpl
similarity index 100%
rename from test/infra/vsphere/packer-vsphere-flatcar.yaml.tmpl
rename to test/infra/vsphere/packer-vsphere-basic.yaml.tmpl