diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
index a2766e53af38b..18e458dc21e8a 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-419-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.19"
@@ -25,17 +25,17 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-419
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-419
+    - hypershift-operator-pr
     name: 4.19-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-419
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -192,9 +192,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-419-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml
index 10f2a643b7c2b..46327bd51411e 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-420-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.20"
@@ -25,7 +25,7 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-420
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -36,11 +36,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-420
+    - hypershift-operator-pr
     name: 4.20-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-420
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -197,9 +197,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-420-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml
index 1c260e201bc8d..17e64fa8e55ae 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-421-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.21"
@@ -25,7 +25,7 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-421
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -36,11 +36,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-421
+    - hypershift-operator-pr
     name: 4.21-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-421
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -217,9 +217,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-421-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml
index b1dfa8b6f425c..ff45a8fb691db 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml
@@ -15,7 +15,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-422-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.22"
@@ -29,17 +29,17 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-422
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-422
+    - hypershift-operator-pr
     name: 4.22-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-422
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -307,7 +307,8 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-422-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
       INSTALL_FROM_LATEST: "true"
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
index f08003036d05b..e9bbd256428dc 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-419-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.19"
@@ -24,17 +24,17 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-419
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-419
+    - hypershift-operator-pr
     name: "4.19"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-419
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -188,9 +188,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-419-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml
index 9567320550b55..6b9dca520d994 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-420-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.20"
@@ -24,7 +24,7 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-420
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -35,11 +35,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-420
+    - hypershift-operator-pr
     name: "4.20"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-420
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -193,9 +193,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-420-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml
index bd10dc5ce1f8d..cd67f554c5585 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml
@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-421-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.21"
@@ -24,7 +24,7 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-421
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -35,11 +35,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-421
+    - hypershift-operator-pr
     name: "4.21"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-421
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -213,9 +213,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-421-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml
index 042f54498dcb6..abfb04f29445a 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml
@@ -15,7 +15,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-422-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.22"
@@ -28,17 +28,17 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-422
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-422
+    - hypershift-operator-pr
     name: "4.22"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-422
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -303,7 +303,8 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-422-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
       INSTALL_FROM_LATEST: "true"
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-postsubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-postsubmits.yaml
index 062c75f911961..9bc38fc99d11c 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-postsubmits.yaml
@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-presubmits.yaml
index 6d0446d01214b..3c0896b8f63ae 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-presubmits.yaml
@@ -1363,7 +1363,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-postsubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-postsubmits.yaml
index 7c7c31a62387c..6a36aa9cb10ac 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-postsubmits.yaml
@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-presubmits.yaml
index d19f0dbd4d7f4..ccc16ca6ea139 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-presubmits.yaml
@@ -1553,7 +1553,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-postsubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-postsubmits.yaml
index 7cd79f5fcba4b..b9084e5658690 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-postsubmits.yaml
@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-presubmits.yaml
index 0452b70b113ec..e960024d3ec11 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-presubmits.yaml
@@ -1840,7 +1840,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-postsubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-postsubmits.yaml
index c79ab1c550fa4..d3c84d4b6df19 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-postsubmits.yaml
@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-422
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-presubmits.yaml
index 373c02efec62a..14e67c2566ea2 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22-presubmits.yaml
@@ -2324,7 +2324,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-422
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-postsubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-postsubmits.yaml
index 4ae2bede87692..2fee7f1fb10d3 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-postsubmits.yaml
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml
index 8f44ad5366572..d0c1a5eab355f 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml
@@ -1232,7 +1232,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=[release:latest]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-postsubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-postsubmits.yaml
index 9668e0cf192cb..c677e8818454e 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-postsubmits.yaml
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml
index 80add1301f251..4adae386b0761 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml
@@ -1404,7 +1404,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=[release:latest]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-postsubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-postsubmits.yaml
index 2deabd6b1b967..097d190e92a3f 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-postsubmits.yaml
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml
index 93c80ffae0ae0..86fe58c90f64f 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml
@@ -1664,7 +1664,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=[release:latest]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-postsubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-postsubmits.yaml
index e901f87d2d616..d36bcc30f1172 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-postsubmits.yaml
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-422
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-presubmits.yaml
index 855a0ae746979..a97658d094300 100644
--- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-presubmits.yaml
+++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-presubmits.yaml
@@ -2103,7 +2103,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=[release:latest]
-        - --target=hypershift-operator-422
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
diff --git a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
index 655846a787c7b..b0a103090a25f 100755
--- a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
+++ b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh
@@ -61,6 +61,13 @@ EXTRA_ARGS="${EXTRA_ARGS} --additional-operator-env-vars=IMAGE_KUBEVIRT_CAPI_PRO
 
 case "${CLOUD_PROVIDER}" in
   AWS)
+    # Some jobs (e.g. upgrade-hypershift-operator) install from a release-tagged
+    # HyperShift image, not main. New CLI flags must be gated behind toggles so
+    # older operator versions that lack those flags are not broken.
+    if [ "${ENABLE_SCALE_FROM_ZERO}" == "true" ]; then
+      EXTRA_ARGS="${EXTRA_ARGS} --scale-from-zero-provider aws --scale-from-zero-creds=/etc/hypershift-pool-aws-credentials/credentials"
+    fi
+
     "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \
     --oidc-storage-provider-s3-credentials=/etc/hypershift-pool-aws-credentials/credentials \
     --oidc-storage-provider-s3-bucket-name=hypershift-ci-oidc \
@@ -73,8 +80,6 @@ case "${CLOUD_PROVIDER}" in
     --external-dns-provider=aws \
     --external-dns-credentials=/etc/hypershift-pool-aws-credentials/credentials \
     --external-dns-domain-filter=service.ci.hypershift.devcluster.openshift.com \
-    --scale-from-zero-provider aws \
-    --scale-from-zero-creds=/etc/hypershift-pool-aws-credentials/credentials \
     --wait-until-available \
     ${EXTRA_ARGS}
     ;;
diff --git a/ci-operator/step-registry/hypershift/install/hypershift-install-ref.yaml b/ci-operator/step-registry/hypershift/install/hypershift-install-ref.yaml
index 902948d2db7ab..19f5ca79879ee 100644
--- a/ci-operator/step-registry/hypershift/install/hypershift-install-ref.yaml
+++ b/ci-operator/step-registry/hypershift/install/hypershift-install-ref.yaml
@@ -47,6 +47,9 @@ ref:
   - name: TEST_CPO_OVERRIDE
     default: "0"
     documentation: "If set to 1, the hypershift operator will honor CPO overrides for specific Z versions of OCP"
+  - name: ENABLE_SCALE_FROM_ZERO
+    default: "true"
+    documentation: "If true, pass --scale-from-zero-provider and --scale-from-zero-creds flags during hypershift install. Supported in 4.22+."
   - name: AZURE_SELF_MANAGED
     default: "false"
     documentation: "If true, skip the --managed-service=ARO-HCP flag during hypershift install. Use for self-managed Azure E2E tests."