diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml
index 2414e76f8ba08..a72f1c95e2888 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml
@@ -5315,8 +5315,8 @@ periodics:
       - --lease-server-password-file=/etc/boskos/password
       - --lease-server-username=ci
       - --secret-dir=/usr/local/pull-secret
-      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile
-      - --target=e2e-$(CLUSTER_TYPE)-upgrade
+      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-all-cluster-profile
+      - --target=e2e-$(CLUSTER_TYPE)-upgrade-all
       - --input-hash=$(BUILD_ID)
       - --input-hash=$(JOB_NAME)
       command:
@@ -5389,6 +5389,12 @@ periodics:
             openshift_installer:
               cluster_profile: "$(CLUSTER_TYPE)"
               upgrade: true
+          - as: e2e-$(CLUSTER_TYPE)-upgrade-all
+            commands: |
+              TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests; TEST_SUITE=openshift/conformance run-tests
+            openshift_installer:
+              cluster_profile: "$(CLUSTER_TYPE)"
+              upgrade: true
           - as: launch-$(CLUSTER_TYPE)
             commands: sleep 9000 & wait
             openshift_installer:
@@ -5406,7 +5412,7 @@ periodics:
       - mountPath: /etc/boskos
         name: boskos
         readOnly: true
-      - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+      - mountPath: /usr/local/e2e-aws-upgrade-all-cluster-profile
         name: cluster-profile
       - mountPath: /usr/local/pull-secret
         name: release-pull-secret
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml
index c110dbbda127d..bc2195d51c2d9 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml
@@ -4699,8 +4699,8 @@ periodics:
       - --lease-server-password-file=/etc/boskos/password
       - --lease-server-username=ci
       - --secret-dir=/usr/local/pull-secret
-      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile
-      - --target=e2e-$(CLUSTER_TYPE)-upgrade
+      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-aws-cluster-profile
+      - --target=e2e-$(CLUSTER_TYPE)-upgrade-all
       - --input-hash=$(BUILD_ID)
       - --input-hash=$(JOB_NAME)
       command:
@@ -4770,7 +4770,13 @@ periodics:
           - as: e2e-$(CLUSTER_TYPE)-upgrade
             commands: |
               TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests
-              TEST_SUITE=openshift/conformance/parallel run-tests
+            openshift_installer:
+              cluster_profile: "$(CLUSTER_TYPE)"
+              upgrade: true
+          - as: e2e-$(CLUSTER_TYPE)-upgrade-all
+            commands: |
+              TEST_SUITE=all IMAGE=RELEASE_IMAGES run-upgrade-tests
+              TEST_SUITE=openshift/conformance run-tests
             openshift_installer:
               cluster_profile: "$(CLUSTER_TYPE)"
               upgrade: true
@@ -4791,7 +4797,7 @@ periodics:
       - mountPath: /etc/boskos
         name: boskos
         readOnly: true
-      - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+      - mountPath: /usr/local/e2e-aws-upgrade-all-cluster-profile
         name: cluster-profile
       - mountPath: /usr/local/pull-secret
         name: release-pull-secret