diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml
index fc25423370d5a..73a2ec13c3da8 100644
--- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml
index 106d2a4828388..28514dcfe3651 100644
--- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml
index 63611f80f530d..57ec6b67d56a5 100644
--- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml
@@ -261,8 +261,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml
index 4c9b3a3d8a28b..5711de8d9db5f 100644
--- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml
@@ -259,9 +259,6 @@ tests:
 - as: e2e-aws-selfupgrade
   steps:
     cluster_profile: aws
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
index 3ea48bcb03c0f..395ba4c509997 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml
index b70599c5c0094..ae51bb579d2a2 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
index 86bd91f24b76b..5da6f8f70b32f 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
@@ -261,8 +261,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
index 3f096e6b1550b..af4023929ce92 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
@@ -259,9 +259,6 @@ tests:
 - as: e2e-aws-selfupgrade
   steps:
     cluster_profile: aws
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
index ca6ec16beab43..3ba916bc3658c 100755
--- a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
@@ -8,12 +8,12 @@ cluster_name=${NAMESPACE}-${JOB_NAME_HASH}
 
 out=${SHARED_DIR}/install-config.yaml
 
-if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
-  echo "RELEASE_IMAGE_LATEST is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${RELEASE_IMAGE_LATEST}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 
 ssh_pub_key=$(<"${CLUSTER_PROFILE_DIR}/ssh-publickey")
 pull_secret=$(<"${CLUSTER_PROFILE_DIR}/pull-secret")
diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
index 55bcd751c6714..ebf8054fda50d 100644
--- a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
@@ -5,6 +5,9 @@ ref:
    name: centos
    tag: '8'
   commands: ipi-conf-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m
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 6d0c3db64e30a..c8157c156d225 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
@@ -37,12 +37,13 @@ function prepare_next_steps() {
 trap 'prepare_next_steps' EXIT
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
 export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
 export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}
diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
index 2df217c667d40..e62d52aced273 100644
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
@@ -2,14 +2,12 @@ ref:
   as: ipi-install-install
   from: installer
   commands: ipi-install-install-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 1000m
       memory: 2Gi
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
   documentation: |-
     The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
diff --git a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml
index 8eaa0c956be29..4d5cabd4ba93e 100644
--- a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml
@@ -8,8 +8,6 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   documentation: |-
     The IPI install step runs the OpenShift Installer from stable-initial imagestream in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
diff --git a/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh b/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh
index 6a0c330f429da..0be9bd145c50c 100644
--- a/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh
+++ b/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh
@@ -6,12 +6,13 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
 export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
 export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}
diff --git a/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml b/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml
index 7ecb46b5d6a2b..5d788beaca072 100644
--- a/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml
@@ -8,9 +8,7 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   credentials:
     - mount_path: /tmp/secret-kube
       name: cluster-secrets-kubevirt
diff --git a/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh b/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh
index 2c09b8defa4af..dd2e4c0bbb37a 100755
--- a/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh
+++ b/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh
@@ -4,10 +4,4 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
-  exit 1
-fi
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
-
 cp "${CLUSTER_PROFILE_DIR}/csi-test-manifest.yaml" "${SHARED_DIR}"
diff --git a/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml b/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml
index cde94f59a7591..d2fcd6bf15de9 100644
--- a/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml
@@ -5,11 +5,6 @@ ref:
     namespace: ocp
     tag: latest
   commands: ipi-install-ovirt-prepare-env-commands.sh
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
   resources:
     requests:
       cpu: 10m
diff --git a/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml b/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml
index f39989c5d077d..c6c114cdae277 100644
--- a/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml
@@ -8,9 +8,7 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   documentation: >-
     The vSphere IPI install step runs the OpenShift Installer in order to bring
     up an OpenShift cluster. Unlike the other IPI installs, the installer image
diff --git a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh
index 4c593991184ee..81579225340c4 100644
--- a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh
+++ b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh
@@ -91,4 +91,4 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJE
 LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \
   --zone "${GOOGLE_COMPUTE_ZONE}" \
   packer@"${INSTANCE_PREFIX}" \
-  --command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST}  && timeout 360m bash -ce \"/home/packer/run-tests.sh\""
+  --command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${OPENSHIFT_INSTALL_RELEASE_IMAGE}  && timeout 360m bash -ce \"/home/packer/run-tests.sh\""
diff --git a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml
index 0105d45f1e9d6..8b59ef25f477a 100644
--- a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml
+++ b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml
@@ -2,6 +2,9 @@ ref:
   as: openshift-e2e-gcp-crc-test
   from: libvirt-installer
   commands: openshift-e2e-gcp-crc-test-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m
diff --git a/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh b/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh
index 72baa70388a3c..194e0fc75c60d 100755
--- a/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh
+++ b/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh
@@ -121,7 +121,7 @@ fi
 function upgrade() {
     set -x
     openshift-tests run-upgrade all \
-        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
+        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
         --options "${TEST_UPGRADE_OPTIONS-}" \
         --provider "${TEST_PROVIDER}" \
         -o "${ARTIFACT_DIR}/e2e.log" \
diff --git a/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml
index 146f86df94c55..6565c518b1ce5 100644
--- a/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml
+++ b/ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml
@@ -16,7 +16,7 @@ ref:
                     suite to verify the cluster is still functional. This is typically used for testing
                     disruption from one suite, then confirming that the disruption did not degrade the
                     product.
-        * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
+        * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
                     The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
                     must run the default upgrade test (verify an upgrade completes) on pull requests
                     prior to merge.
@@ -45,7 +45,7 @@ ref:
         details. The file must be present in ${SHARED_DIR}.
   dependencies:
     - name: "release:latest"
-      env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
+      env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
   resources:
     requests:
       cpu: "3"
diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
index 7f0bc687dbfda..079d3473a8aff 100644
--- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
+++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
@@ -121,7 +121,7 @@ fi
 function upgrade() {
     set -x
     openshift-tests run-upgrade all \
-        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
+        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
         --options "${TEST_UPGRADE_OPTIONS-}" \
         --provider "${TEST_PROVIDER}" \
         -o "${ARTIFACT_DIR}/e2e.log" \
diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml
index 4e7d5e7d5f907..2538a1e5f4633 100644
--- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml
+++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml
@@ -3,6 +3,9 @@ ref:
   from: tests
   commands: openshift-e2e-test-commands.sh
   timeout: 10800s
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
   env:
   - name: TEST_TYPE
     default: "suite"
@@ -16,7 +19,7 @@ ref:
                   suite to verify the cluster is still functional. This is typically used for testing
                   disruption from one suite, then confirming that the disruption did not degrade the
                   product.
-      * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
+      * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
                   The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
                   must run the default upgrade test (verify an upgrade completes) on pull requests
                   prior to merge.
@@ -49,9 +52,6 @@ ref:
       Name of the CSI driver manifest file to use.  Used by the `openshift-tests`
       program as TEST_CSI_DRIVER_FILES env. var., see its documentation for
       details. The file must be present in ${SHARED_DIR}.
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
   resources:
     requests:
       cpu: "3"
diff --git a/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml
index 20022c41f7be6..21ec80dc928e3 100644
--- a/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml
@@ -11,8 +11,7 @@ workflow:
     - ref: openshift-e2e-test-capabilities-check
     - chain: ipi-aws-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml
index 39558958ea50f..c1ba1876ff42f 100644
--- a/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml
@@ -15,8 +15,8 @@ workflow:
     - chain: gather-core-dump
     - chain: ipi-aws-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml
index a65026023fbd2..581d8f0ae94fd 100644
--- a/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml
@@ -10,8 +10,7 @@ workflow:
     post:
     - chain: ipi-azure-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml
index 6ec6bdc20a66d..20897c6c7cf9c 100644
--- a/ci-operator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml
@@ -14,8 +14,8 @@ workflow:
     - chain: gather-core-dump
     - chain: ipi-azure-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml
index e1864f9706731..99132569c02e4 100644
--- a/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml
@@ -10,8 +10,8 @@ workflow:
     post:
     - chain: ipi-gcp-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml
index 125a6e24eccdf..cfa24cecdfcf6 100644
--- a/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml
@@ -13,8 +13,8 @@ workflow:
     - chain: gather-network
     - chain: ipi-gcp-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml
index 07d2089654f8f..c1ab2174e6a8e 100644
--- a/ci-operator/step-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml
@@ -10,8 +10,8 @@ workflow:
     post:
     - chain: ipi-openstack-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml
index 2810cc1fc8b62..a4e7463084fcc 100644
--- a/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml
@@ -12,8 +12,8 @@ workflow:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: ""
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
   documentation: |-
     The Openshift E2E oVirt upgrade workflow installs OpenShift cluster on top of oVirt
     and executes an upgrade to the next available version.
diff --git a/ci-operator/step-registry/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml
index da0b594563497..474a8e5b51d47 100644
--- a/ci-operator/step-registry/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml
@@ -12,8 +12,8 @@ workflow:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: ""
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
   documentation: |-
     The Openshift E2E oVirt upgrade without csi workflow installs OpenShift cluster on top of oVirt
     from releases that didn't contain the oVirt csi driver, therfor patch the image registry.
diff --git a/ci-operator/step-registry/openshift/upgrade/vsphere/openshift-upgrade-vsphere-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/vsphere/openshift-upgrade-vsphere-workflow.yaml
index 93b991e1f5db1..5c3adc9463081 100644
--- a/ci-operator/step-registry/openshift/upgrade/vsphere/openshift-upgrade-vsphere-workflow.yaml
+++ b/ci-operator/step-registry/openshift/upgrade/vsphere/openshift-upgrade-vsphere-workflow.yaml
@@ -9,8 +9,8 @@ workflow:
     post:
     - chain: ipi-vsphere-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
index 360feaddcae6b..f9be3295ac426 100755
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
@@ -8,11 +8,11 @@ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wa
 
 export HOME=/tmp
 
-if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
-  echo "RELEASE_IMAGE_LATEST is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
-export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_LATEST}"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 
 # Ensure ignition assets are configured with the correct invoker to track CI jobs.
 export OPENSHIFT_INSTALL_INVOKER="openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}"
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
index 4efb52b7be0bd..f0c566d41ead3 100644
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
@@ -2,6 +2,9 @@ ref:
   as: upi-conf-gcp
   from: upi-installer
   commands: upi-conf-gcp-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m
diff --git a/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-commands.sh b/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-commands.sh
index e26d494126115..5409c2323f2e6 100755
--- a/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-commands.sh
+++ b/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-commands.sh
@@ -6,8 +6,8 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
-  echo "RELEASE_IMAGE_LATEST is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 # ensure LEASED_RESOURCE is set
@@ -19,7 +19,7 @@ fi
 third_octet=$(grep -oP 'ci-segment-\K[[:digit:]]+' <(echo "${LEASED_RESOURCE}"))
 
 export HOME=/tmp
-export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST}
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 # Ensure ignition assets are configured with the correct invoker to track CI jobs.
 export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}
 
diff --git a/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-ref.yaml b/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-ref.yaml
index 1658c29d65b9e..ed794c5636085 100644
--- a/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-ref.yaml
+++ b/ci-operator/step-registry/upi/conf/vsphere/upi-conf-vsphere-ref.yaml
@@ -2,6 +2,9 @@ ref:
   as: upi-conf-vsphere
   from: upi-installer
   commands: upi-conf-vsphere-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m