diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
index 05291f2a126f1..6120983a7e83d 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
@@ -45,7 +45,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3.yaml
index d3c7386063f05..9e4035d17d270 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3.yaml
@@ -45,7 +45,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4.yaml
index b16250b414181..17eac95577dc0 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4.yaml
@@ -45,7 +45,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5.yaml
index f9016d0d45ce0..539e337a5d5dd 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5.yaml
@@ -46,7 +46,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6.yaml
index f10d6202d874e..f17b064a586a1 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6.yaml
@@ -45,7 +45,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
index 83b10bfd38f0b..bfdbc84655f34 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
@@ -44,7 +44,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml
index 7190efe6ac349..402797a0bbc2e 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml
@@ -44,7 +44,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml
index cc9d372e3d6b2..e58666c381af0 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml
@@ -44,7 +44,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5.yaml
index 25883359477a6..d42c40f2f3018 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5.yaml
@@ -45,7 +45,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6.yaml
index 1be0bb6fc1ef3..6153013501efd 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6.yaml
@@ -44,7 +44,7 @@ tests:
   openshift_installer:
     cluster_profile: gcp
 - as: e2e-gcp-ovn-upgrade
-  commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
+  commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
     upgrade: true
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
index 6054f1b2836c1..58bf89ebefd07 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
@@ -131,6 +131,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3-presubmits.yaml
index 3c8635e518826..8186aa6c36a3a 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3-presubmits.yaml
@@ -131,6 +131,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4-presubmits.yaml
index be440d9e780c9..98f6ca5b984ce 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4-presubmits.yaml
@@ -131,6 +131,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5-presubmits.yaml
index 3ed6b551faeb7..4dad38e3d48dd 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5-presubmits.yaml
@@ -131,6 +131,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6-presubmits.yaml
index 34c0599515012..c5bdf32e40ab0 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6-presubmits.yaml
@@ -131,6 +131,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
index 271f79e46685b..33ebe8512b1c6 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
@@ -429,6 +429,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3-presubmits.yaml
index a9b66cac6c058..374d197033f16 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3-presubmits.yaml
@@ -119,6 +119,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4-presubmits.yaml
index df11676c234da..a13f39999bf6b 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4-presubmits.yaml
@@ -429,6 +429,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5-presubmits.yaml
index d7977f0fe1310..ee9377a9aa87d 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5-presubmits.yaml
@@ -119,6 +119,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6-presubmits.yaml
index ed626b083d5ac..8b87e5c500a79 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6-presubmits.yaml
@@ -327,6 +327,11 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CLUSTER_VARIANT
+          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
index bd1768b006643..79ef7a2260073 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
@@ -25,7 +25,6 @@ parameters:
   required: true
 - name: BASE_DOMAIN
 - name: CLUSTER_NETWORK_MANIFEST
-- name: CLUSTER_NETWORK_TYPE
 - name: CLUSTER_VARIANT
 - name: BUILD_ID
   required: false
@@ -597,7 +596,7 @@ objects:
         EOF
         fi
 
-        network_type="${CLUSTER_NETWORK_TYPE-}"
+        network_type=
         if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
           network_type=OVNKubernetes
         fi
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
index b387f4ae86c64..66784e35ea5fc 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -21,7 +21,6 @@ parameters:
   required: true
 - name: BASE_DOMAIN
 - name: CLUSTER_NETWORK_MANIFEST
-- name: CLUSTER_NETWORK_TYPE
 - name: BUILD_ID
   required: false
 - name: CLUSTER_VARIANT
@@ -691,7 +690,7 @@ objects:
         EOF
         fi
 
-        network_type="${CLUSTER_NETWORK_TYPE-}"
+        network_type=
         if has_variant "ovn"; then
           network_type=OVNKubernetes
         fi
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
index fb34bfa7e98b7..cb03db52c36e1 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
@@ -24,7 +24,6 @@ parameters:
 - name: BASE_DOMAIN
   value: origin-ci-int-aws.dev.rhcloud.com
 - name: CLUSTER_NETWORK_MANIFEST
-- name: CLUSTER_NETWORK_TYPE
 - name: BUILD_ID
   required: false
 - name: CLUSTER_VARIANT
@@ -371,7 +370,7 @@ objects:
         EOF
         fi
 
-        network_type="${CLUSTER_NETWORK_TYPE-}"
+        network_type=
         if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
           network_type=OVNKubernetes
         fi
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
index 52934c61097fa..6b19edf62e9e9 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
@@ -26,7 +26,6 @@ parameters:
 - name: RELEASE_IMAGE_LATEST
   required: true
 - name: BASE_DOMAIN
-- name: CLUSTER_NETWORK_TYPE
 - name: CLUSTER_VARIANT
 - name: BUILD_ID
   required: false
@@ -528,7 +527,7 @@ objects:
         EOF
         fi
 
-        network_type="${CLUSTER_NETWORK_TYPE-}"
+        network_type=
         if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
           network_type=OVNKubernetes
         fi