diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
index 62324b831cb00..29b4badb53668 100755
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
+++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
@@ -38,6 +38,8 @@ cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/
 openshift-install --dir="${dir}" create manifests &
 wait "$!"
 
+sed -i '/^  channel:/d' "${dir}/manifests/cvo-overrides.yaml"
+
 while IFS= read -r -d '' item
 do
   manifest="$( basename "${item}" )"
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 3c067273b6c8e..9fdb6f2a70d33 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
@@ -649,9 +649,13 @@ objects:
         EOF
         fi
 
+        openshift-install --dir=/tmp/artifacts/installer/ create manifests &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
+
         # TODO: Replace with a more concise manifest injection approach
         if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then
-            openshift-install --dir=/tmp/artifacts/installer/ create manifests
             echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
         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 7620b1746e344..8fbfe4fc5a112 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -770,9 +770,13 @@ objects:
           export OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP=true
         fi
 
+        openshift-install --dir=/tmp/artifacts/installer/ create manifests &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
+
         # TODO: Replace with a more concise manifest injection approach
         if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
-            openshift-install --dir=/tmp/artifacts/installer/ create manifests
             echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
         fi
 
@@ -781,7 +785,6 @@ objects:
             echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the "rt" variant'
             exit 1
           fi
-          openshift-install --dir=/tmp/artifacts/installer/ create manifests
           cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF
         apiVersion: machineconfiguration.openshift.io/v1
         kind: MachineConfig
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 0c17089fb1d54..a22a87fe7c932 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
@@ -398,7 +398,10 @@ objects:
         EOF
         fi
 
-        openshift-install --dir=/tmp/artifacts/installer/ create manifests
+        openshift-install --dir=/tmp/artifacts/installer/ create manifests &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
 
         # TODO: Replace with a more concise manifest injection approach
         if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
index 7bceb53865a6a..b358b566104b6 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
@@ -382,7 +382,11 @@ objects:
 
         # What we're doing here is we generate manifests first and force that OpenShift SDN is configured. Kuryr is only
         # allowed when KURYR_ENABLED variable is set to "true".
-        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
+        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
+
         if [[ "${KURYR_ENABLED:-false}" != "true" ]]; then
           echo "Forcing OpenShiftSDN by modifying manifests"
           sed -i -e 's/networkType: .*$/networkType: OpenShiftSDN/g' /tmp/artifacts/installer/manifests/cluster-network-02-config.yml
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-upi-e2e.yaml
index f01533a8943cc..61e16e8898f19 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-upi-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-upi-e2e.yaml
@@ -437,6 +437,8 @@ objects:
           echo "Creating manifest files"
           TF_LOG=debug openshift-install --dir=${ASSETS_DIR} create manifests  --log-level=debug 2>&1 | grep --line-buffered -v password
 
+          sed -i '/^  channel:/d' "${ASSETS_DIR}/manifests/cvo-overrides.yaml"
+
           #Remove Machines from manifests
           rm -f ${ASSETS_DIR}/openshift/99_openshift-cluster-api_master-machines-*.yaml
 
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
index 65debbe71be4a..7e8672c915aef 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
@@ -436,7 +436,11 @@ objects:
         mv /tmp/artifacts/installer/master.ign.out /tmp/artifacts/installer/master.ign
 
         # What we're doing here is we generate manifests first and force that OpenShift SDN is configured.
-        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
+        TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
+
         # This is for debugging purposes, allows us to map a job to a VM
         cat /tmp/artifacts/installer/manifests/cluster-infrastructure-02-config.yml
 
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
index fea30b6eb8727..b41131377996f 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
@@ -516,6 +516,7 @@ objects:
         # Bump the libvirt masters memory to 16GB
         export TF_VAR_libvirt_master_memory=16384
         mock-nss.sh openshift-install create manifests --dir=/tmp/artifacts/installer
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
         ls /tmp/artifacts/installer/openshift
         for ((i=0; i<$MASTER_REPLICAS; i++))
         do
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 91aa3dab1b08c..0169b4c868767 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
@@ -628,9 +628,12 @@ objects:
           export OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP=true
         fi
 
+        openshift-install --dir=/tmp/artifacts/installer/ create manifests &
+        wait "$!"
+
+        sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
         # TODO: Replace with a more concise manifest injection approach
         if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
-            openshift-install --dir=/tmp/artifacts/installer/ create manifests
             echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
         fi
 
@@ -639,7 +642,6 @@ objects:
             echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the "rt" variant'
             exit 1
           fi
-          openshift-install --dir=/tmp/artifacts/installer/ create manifests
           cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF
         apiVersion: machineconfiguration.openshift.io/v1
         kind: MachineConfig
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 4538e01873abf..aeeb27d66d36e 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
@@ -1134,6 +1134,7 @@ objects:
           fi
 
           openshift-install --dir=/tmp/artifacts/installer create manifests
+          sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
           sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
@@ -1161,6 +1162,7 @@ objects:
         EOF
 
           openshift-install --dir=/tmp/artifacts/installer create manifests
+          sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
           sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
@@ -1219,6 +1221,7 @@ objects:
             fi
 
             openshift-install --dir=/tmp/artifacts/installer create manifests
+            sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
             rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
             rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
             sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
@@ -1269,6 +1272,7 @@ objects:
             pushd /tmp/artifacts/installer
 
             echo "Editing manifests"
+            sed -i '/^  channel:/d' manifests/cvo-overrides.yaml
             rm -f openshift/99_openshift-cluster-api_master-machines-*.yaml
             rm -f openshift/99_openshift-cluster-api_worker-machineset-*.yaml
             sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" manifests/cluster-scheduler-02-config.yml
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
index 331101fc16fb5..af656ac5d6c88 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
@@ -415,6 +415,7 @@ objects:
         EOF
 
           openshift-install --dir=/tmp/artifacts/installer create manifests
+          sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machinesets-*.yaml
         elif [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
           base_domain="${BASE_DOMAIN:-origin-ci-int-gce.dev.openshift.com}"
@@ -440,6 +441,7 @@ objects:
         EOF
 
           openshift-install --dir=/tmp/artifacts/installer create manifests
+          sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
           rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
           sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
@@ -499,6 +501,7 @@ objects:
             fi
 
             openshift-install --dir=/tmp/artifacts/installer create manifests
+            sed -i '/^  channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
             rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
             rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
             sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml