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 5a0788c97ac57..4c3140f5a852c 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
@@ -100,10 +100,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
index 8ac2d4ed0fc63..e2c67d477f64c 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -277,13 +277,13 @@ presubmits:
         env:
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: fips
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-installer-master.yaml
               name: ci-operator-master-configs
-        - name: ENABLE_FIPS
-          value: "true"
         - name: JOB_NAME_SAFE
           value: e2e-aws-fips
         - name: TEST_COMMAND
@@ -346,13 +346,13 @@ presubmits:
         env:
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: proxy
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-installer-master.yaml
               name: ci-operator-master-configs
-        - name: ENABLE_PROXY
-          value: "true"
         - name: JOB_NAME_SAFE
           value: e2e-aws-proxy
         - name: TEST_COMMAND
diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
index 7301abb4a0397..0f7080d793786 100644
--- a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
@@ -202,13 +202,13 @@ presubmits:
         env:
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: fips
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-origin-master.yaml
               name: ci-operator-master-configs
-        - name: ENABLE_FIPS
-          value: "true"
         - name: JOB_NAME_SAFE
           value: e2e-aws-fips
         - name: TEST_COMMAND
@@ -484,10 +484,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
diff --git a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
index 762fb199d0850..935dd3eba6ce4 100644
--- a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
@@ -24,10 +24,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
diff --git a/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml
index ca4074e68307c..f68aef40c032b 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml
@@ -23,6 +23,7 @@ periodics:
       - ci-operator
       env:
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: CLUSTER_DURATION
         value: "9000"
       - name: BRANCH
@@ -115,6 +116,7 @@ periodics:
       - ci-operator
       env:
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: CLUSTER_DURATION
         value: "9000"
       - name: BRANCH
@@ -209,6 +211,7 @@ periodics:
       - ci-operator
       env:
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: CLUSTER_DURATION
         value: "9000"
       - name: BRANCH
@@ -301,6 +304,7 @@ periodics:
       - ci-operator
       env:
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: CLUSTER_DURATION
         value: "9000"
       - name: BRANCH
@@ -393,6 +397,7 @@ periodics:
       - ci-operator
       env:
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: CLUSTER_DURATION
         value: "9000"
       - name: BRANCH
@@ -484,6 +489,7 @@ periodics:
       env:
       - name: RELEASE_IMAGE_INITIAL
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: BRANCH
         value: "4.1"
       - name: CLUSTER_TYPE
@@ -562,6 +568,7 @@ periodics:
       env:
       - name: RELEASE_IMAGE_INITIAL
       - name: RELEASE_IMAGE_LATEST
+      - name: CLUSTER_VARIANT
       - name: BRANCH
         value: "4.1"
       - name: CLUSTER_TYPE
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml
index 73d90699e7fe4..953b2f02f14c0 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml
@@ -422,8 +422,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -504,8 +504,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -586,8 +586,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_PROXY
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: proxy
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1064,8 +1064,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1148,8 +1148,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1230,8 +1230,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1476,8 +1476,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -3380,6 +3380,8 @@ periodics:
         value: "4.2"
       - name: CLUSTER_TYPE
         value: aws
+      - name: CLUSTER_VARIANT
+        value: mirror
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -3399,8 +3401,6 @@ periodics:
               cluster_profile: aws
       - name: JOB_NAME_SAFE
         value: e2e-aws
-      - name: ENABLE_MIRROR
-        value: "true"
       - name: TEST_COMMAND
         value: |
           patch_image_specs
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
index e2e50b4b5eb23..66d9ee5dd31ae 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
@@ -783,8 +783,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -861,8 +861,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -939,8 +939,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1017,8 +1017,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1175,8 +1175,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1257,8 +1257,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1339,8 +1339,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_PROXY
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: proxy
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1817,8 +1817,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1901,8 +1901,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1983,8 +1983,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -2147,8 +2147,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -4559,6 +4559,8 @@ periodics:
         value: "4.3"
       - name: CLUSTER_TYPE
         value: aws
+      - name: CLUSTER_VARIANT
+        value: mirror
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -4578,8 +4580,6 @@ periodics:
               cluster_profile: aws
       - name: JOB_NAME_SAFE
         value: e2e-aws
-      - name: ENABLE_MIRROR
-        value: "true"
       - name: TEST_COMMAND
         value: |
           patch_image_specs
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
index bdc2667a993a9..6c06a98bc5e02 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
@@ -530,8 +530,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -608,8 +608,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -686,8 +686,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -764,8 +764,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: CLUSTER_NETWORK_TYPE
-        value: OVNKubernetes
+      - name: CLUSTER_VARIANT
+        value: ovn
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -922,8 +922,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1004,8 +1004,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1086,8 +1086,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_PROXY
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: proxy
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1564,8 +1564,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1648,8 +1648,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: azure4
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1730,8 +1730,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -1894,8 +1894,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: gcp
-      - name: ENABLE_FIPS
-        value: "true"
+      - name: CLUSTER_VARIANT
+        value: fips
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -4306,6 +4306,8 @@ periodics:
         value: "4.4"
       - name: CLUSTER_TYPE
         value: aws
+      - name: CLUSTER_VARIANT
+        value: mirror
       - name: CONFIG_SPEC
         value: |
           tag_specification:
@@ -4325,8 +4327,6 @@ periodics:
               cluster_profile: aws
       - name: JOB_NAME_SAFE
         value: e2e-aws
-      - name: ENABLE_MIRROR
-        value: "true"
       - name: TEST_COMMAND
         value: |
           patch_image_specs
diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml
index 469d3909bc290..586053c0ead45 100644
--- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-presubmits.yaml
@@ -76,10 +76,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -146,10 +146,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -263,10 +263,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3-presubmits.yaml
index 15e97d58e33fe..6fb8613da9f16 100644
--- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.3-presubmits.yaml
@@ -76,10 +76,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -146,10 +146,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -263,10 +263,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4-presubmits.yaml
index dc547fd0d686b..1230e405a6e4c 100644
--- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.4-presubmits.yaml
@@ -76,10 +76,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -146,10 +146,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
@@ -263,10 +263,10 @@ presubmits:
         command:
         - ci-operator
         env:
-        - name: CLUSTER_NETWORK_TYPE
-          value: OVNKubernetes
         - name: CLUSTER_TYPE
           value: aws
+        - name: CLUSTER_VARIANT
+          value: ovn
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
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 ac4fdf14e0b1b..be67950d89fb3 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
@@ -26,11 +26,9 @@ parameters:
 - name: BASE_DOMAIN
 - name: CLUSTER_NETWORK_MANIFEST
 - name: CLUSTER_NETWORK_TYPE
-- name: ENABLE_FIPS
-- name: ENABLE_PROXY
+- name: CLUSTER_VARIANT
 - name: BUILD_ID
   required: false
-- name: ENABLE_MIRROR
 
 objects:
 
@@ -425,8 +423,6 @@ objects:
         value: ${RELEASE_IMAGE_LATEST}
       - name: OPENSHIFT_INSTALL_INVOKER
         value: openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}
-      - name: ENABLE_MIRROR
-        value: ${ENABLE_MIRROR}
       - name: USER
         value: test
       - name: HOME
@@ -435,8 +431,6 @@ objects:
         value: registry.svc.ci.openshift.org/${NAMESPACE}/release
       - name: INSTALL_INITIAL_RELEASE
       - name: RELEASE_IMAGE_INITIAL
-      - name: ENABLE_FIPS
-        value: ${ENABLE_FIPS}
       command:
       - /bin/bash
       - -c
@@ -466,7 +460,7 @@ objects:
         if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
           echo "Installing from initial release ${RELEASE_IMAGE_INITIAL}"
           OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_INITIAL}"
-        elif [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        elif [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           export PATH=$PATH:/tmp/shared  # gain access to oc
           while [ ! command -V oc ]; do sleep 1; done # poll to make sure that the test container has dropped oc into the shared volume
 
@@ -584,7 +578,7 @@ objects:
 
         # as a current stop gap -- this is pointing to a proxy hosted in
         # the namespace "ci-test-ewolinet" on the ci cluster
-        if [[ "${ENABLE_PROXY}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
 
         # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1750650 we need to
         # use a http endpoint for the httpsProxy value
@@ -667,14 +661,18 @@ objects:
         EOF
         fi
 
-        if [[ -n "${CLUSTER_NETWORK_TYPE}" ]]; then
+        network_type="${CLUSTER_NETWORK_TYPE-}"
+        if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
+          network_type=OVNKubernetes
+        fi
+        if [[ -n "${network_type}" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         networking:
-          networkType: ${CLUSTER_NETWORK_TYPE}
+          networkType: ${network_type}
         EOF
         fi
 
-        if [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         imageContentSources:
         - source: "${MIRROR_BASE}-scratch"
@@ -689,7 +687,7 @@ objects:
             echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
         fi
 
-        if [[ "${ENABLE_FIPS}" == true ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "fips" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         fips: true
         EOF
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 1c2baabe1a1e6..ce0cc27771438 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -22,11 +22,8 @@ parameters:
 - name: BASE_DOMAIN
 - name: CLUSTER_NETWORK_MANIFEST
 - name: CLUSTER_NETWORK_TYPE
-- name: ENABLE_FIPS
-- name: ENABLE_PROXY
 - name: BUILD_ID
   required: false
-- name: ENABLE_MIRROR
 - name: CLUSTER_VARIANT
 
 objects:
@@ -223,7 +220,7 @@ objects:
           oc --insecure-skip-tls-verify --request-timeout=60s get nodes -o jsonpath --template '{range .items[*]}{.metadata.name}{"\n"}{end}' > /tmp/nodelist
           while IFS= read -r i; do
             oc -n default --insecure-skip-tls-verify --request-timeout=60s debug node/$i -- cat /proc/sys/crypto/fips_enabled > /tmp/enabled
-            if [[ "${ENABLE_FIPS}" == true ]]; then
+            if [[ "${CLUSTER_VARIANT}" =~ "fips" ]]; then
               if [[ $(< /tmp/enabled) == "0" ]]; then
                 echo fips not enabled in node "$i" but should be, exiting
                 exit 1
@@ -431,10 +428,6 @@ objects:
         value: ${RELEASE_IMAGE_LATEST}
       - name: OPENSHIFT_INSTALL_INVOKER
         value: openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}
-      - name: ENABLE_MIRROR
-        value: ${ENABLE_MIRROR}
-      - name: ENABLE_FIPS
-        value: ${ENABLE_FIPS}
       - name: USER
         value: test
       - name: HOME
@@ -472,7 +465,7 @@ objects:
         if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
           echo "Installing from initial release ${RELEASE_IMAGE_INITIAL}"
           OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_INITIAL}"
-        elif [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        elif [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           export PATH=$PATH:/tmp  # gain access to oc
           while [ ! command -V oc ]; do sleep 1; done # poll to make sure that the test container has dropped oc into the shared volume
 
@@ -645,7 +638,7 @@ objects:
 
         # as a current stop gap -- this is pointing to a proxy hosted in
         # the namespace "ci-test-ewolinet" on the ci cluster
-        if [[ "${ENABLE_PROXY}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
 
         # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1750650 we need to
         # use a http endpoint for the httpsProxy value
@@ -728,14 +721,18 @@ objects:
         EOF
         fi
 
-        if [[ -n "${CLUSTER_NETWORK_TYPE}" ]]; then
+        network_type="${CLUSTER_NETWORK_TYPE-}"
+        if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
+          network_type=OVNKubernetes
+        fi
+        if [[ -n "${network_type}" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         networking:
-          networkType: ${CLUSTER_NETWORK_TYPE}
+          networkType: ${network_type}
         EOF
         fi
 
-        if [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         imageContentSources:
         - source: "${MIRROR_BASE}-scratch"
@@ -744,7 +741,7 @@ objects:
         EOF
         fi
 
-        if [[ "${ENABLE_FIPS}" == true ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "fips" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         fips: true
         EOF
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 e99baaa877c80..65c4884411d4a 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
@@ -25,11 +25,8 @@ parameters:
   value: origin-ci-int-aws.dev.rhcloud.com
 - name: CLUSTER_NETWORK_MANIFEST
 - name: CLUSTER_NETWORK_TYPE
-- name: ENABLE_FIPS
-- name: ENABLE_PROXY
 - name: BUILD_ID
   required: false
-- name: ENABLE_MIRROR
 - name: CLUSTER_VARIANT
 
 objects:
@@ -214,10 +211,6 @@ objects:
         value: openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}
       - name: KUBECONFIG
         value: /tmp/artifacts/installer/auth/kubeconfig
-      - name: ENABLE_MIRROR
-        value: ${ENABLE_MIRROR}
-      - name: ENABLE_FIPS
-        value: ${ENABLE_FIPS}
       - name: USER
         value: test
       - name: HOME
@@ -241,7 +234,7 @@ objects:
         if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
           echo "Installing from initial release ${RELEASE_IMAGE_INITIAL}"
           OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_INITIAL}"
-        elif [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        elif [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           export PATH=$PATH:/tmp  # gain access to oc
           while [ ! command -V oc ]; do sleep 1; done # poll to make sure that the test container has dropped oc into the shared volume
 
@@ -290,7 +283,7 @@ objects:
 
         # as a current stop gap -- this is pointing to a proxy hosted in
         # the namespace "ci-test-ewolinet" on the ci cluster
-        if [[ "${ENABLE_PROXY}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
 
         # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1750650 we need to
         # use a http endpoint for the httpsProxy value
@@ -373,14 +366,18 @@ objects:
         EOF
         fi
 
-        if [[ -n "${CLUSTER_NETWORK_TYPE}" ]]; then
+        network_type="${CLUSTER_NETWORK_TYPE-}"
+        if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
+          network_type=OVNKubernetes
+        fi
+        if [[ -n "${network_type}" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         networking:
-          networkType: ${CLUSTER_NETWORK_TYPE}
+          networkType: ${network_type}
         EOF
         fi
 
-        if [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         imageContentSources:
         - source: "${MIRROR_BASE}-scratch"
@@ -389,7 +386,7 @@ objects:
         EOF
         fi
 
-        if [[ "${ENABLE_FIPS}" == true ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "fips" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         fips: true
         EOF
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 a250a020fe4cb..6453fc1b4c63f 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
@@ -288,8 +288,6 @@ objects:
         value: ${RELEASE_IMAGE_LATEST}
       - name: OPENSHIFT_INSTALL_INVOKER
         value: openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}
-      - name: ENABLE_MIRROR
-        value: ${ENABLE_MIRROR}
       - name: USER
         value: test
       - name: HOME
@@ -327,7 +325,7 @@ objects:
         if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
           echo "Installing from initial release ${RELEASE_IMAGE_INITIAL}"
           OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_INITIAL}"
-        elif [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        elif [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           export PATH=$PATH:/tmp  # gain access to oc
           while [ ! command -V oc ]; do sleep 1; done # poll to make sure that the test container has dropped oc into the shared volume
 
@@ -487,7 +485,7 @@ objects:
 
         # as a current stop gap -- this is pointing to a proxy hosted in
         # the namespace "ci-test-ewolinet" on the ci cluster
-        if [[ "${ENABLE_PROXY}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
 
         # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1750650 we need to
         # use a http endpoint for the httpsProxy value
@@ -570,14 +568,18 @@ objects:
         EOF
         fi
 
-        if [[ -n "${CLUSTER_NETWORK_TYPE}" ]]; then
+        network_type="${CLUSTER_NETWORK_TYPE-}"
+        if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
+          network_type=OVNKubernetes
+        fi
+        if [[ -n "${network_type}" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         networking:
-          networkType: ${CLUSTER_NETWORK_TYPE}
+          networkType: ${network_type}
         EOF
         fi
 
-        if [[ "${ENABLE_MIRROR}" == "true" ]]; then
+        if [[ "${CLUSTER_VARIANT}" =~ "mirror" ]]; then
           cat >> /tmp/artifacts/installer/install-config.yaml << EOF
         imageContentSources:
         - source: "${MIRROR_BASE}-scratch"
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
index a276fd9d4da1a..0375a5dcc07b7 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
@@ -22,7 +22,7 @@ parameters:
 - name: BASE_DOMAIN
 - name: BUILD_ID
   required: false
-- name: ENABLE_PROXY
+- name: CLUSTER_VARIANT
 - name: PROXY_IMAGE
   value: registry.svc.ci.openshift.org/origin/4.2:egress-http-proxy
 
@@ -1125,7 +1125,7 @@ objects:
         EOF
 
           # Add proxy info to install-config.yaml
-          if [[ "${ENABLE_PROXY}" == "true" ]]; then
+          if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
 
             # create and sign a cert
             generate_proxy_certs
@@ -1286,7 +1286,7 @@ objects:
 
           # If we are using a proxy, create a 'black-hole' private subnet vpc TODO
           # For now this is just a placeholder...
-          if [[ "${ENABLE_PROXY}" == "true" ]]; then
+          if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
             aws cloudformation create-stack  --stack-name "${CLUSTER_NAME}-vpc" \
               --template-body "$(cat "/var/lib/openshift-install/upi/${CLUSTER_TYPE}/cloudformation/01_vpc.yaml")" \
               --tags "${TAGS}" \
@@ -1362,7 +1362,7 @@ objects:
           WORKER_SECURITY_GROUP="$(echo "${SECURITY_JSON}" | jq -r '.[] | select(.OutputKey == "WorkerSecurityGroupId").OutputValue')"
           WORKER_INSTANCE_PROFILE="$(echo "${SECURITY_JSON}" | jq -r '.[] | select(.OutputKey == "WorkerInstanceProfile").OutputValue')"
 
-          if [[ "${ENABLE_PROXY}" == "true" ]]; then
+          if [[ "${CLUSTER_VARIANT}" =~ "proxy" ]]; then
             echo "creating proxy..."
 
             # define squid config