diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
index 5933d855db73d..ceae10068d168 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -65,7 +65,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml
index c24051fbf8bc4..d2b5cea0d38e2 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml
@@ -65,7 +65,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
index e9217ffbeba3d..4f93d513f6cac 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
@@ -66,7 +66,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
index b0028e9666393..410d47ef3680c 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
@@ -65,7 +65,7 @@ tests:
   openshift_installer:
     cluster_profile: aws
     upgrade: true
-- as: e2e-rhel-scaleup
+- as: e2e-aws-scaleup-rhel7
   commands: TEST_SUITE=openshift/conformance run-tests
   openshift_ansible_40:
     cluster_profile: aws-centos-40
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
index 06df9b777647e..0afdf9bd8963d 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -134,30 +134,40 @@ presubmits:
     always_run: true
     branches:
     - master
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-master-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-machine-config-operator-master-e2e-aws-scaleup-rhel7
+    optional: true
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-aws-upgrade
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
+        - name: CLUSTER_TYPE
+          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-master.yaml
               name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_OPENSHIFT_ORIGIN
+          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -165,8 +175,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
+          name: job-definition
+          subPath: cluster-scaleup-e2e-40.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -177,48 +190,43 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
+          - configMap:
+              name: cluster-profile-aws-centos-40
+      - configMap:
+          name: prow-job-cluster-scaleup-e2e-40
+        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - master
-    context: ci/prow/e2e-restore-cluster-state
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-master-e2e-restore-cluster-state
-    optional: true
-    rerun_command: /test e2e-restore-cluster-state
+    name: pull-ci-openshift-machine-config-operator-master-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-restore-cluster-state
-        - --template=/usr/local/e2e-restore-cluster-state
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         env:
-        - name: CLUSTER_TYPE
-          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-master.yaml
               name: ci-operator-master-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-restore-cluster-state
-        - name: TEST_COMMAND
-          value: |
-            restore-cluster-state
-            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -226,11 +234,8 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-restore-cluster-state
-          name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -241,35 +246,32 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-e2e
-        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
   - agent: kubernetes
     always_run: false
     branches:
     - master
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-restore-cluster-state
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-master-e2e-rhel-scaleup
+    name: pull-ci-openshift-machine-config-operator-master-e2e-restore-cluster-state
     optional: true
-    rerun_command: /test e2e-rhel-scaleup
+    rerun_command: /test e2e-restore-cluster-state
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
+        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --target=e2e-restore-cluster-state
+        - --template=/usr/local/e2e-restore-cluster-state
         command:
         - ci-operator
         env:
@@ -281,11 +283,11 @@ presubmits:
               key: openshift-machine-config-operator-master.yaml
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
+          value: e2e-restore-cluster-state
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: |
+            restore-cluster-state
+            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -293,11 +295,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-restore-cluster-state
           name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
+          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -308,15 +310,13 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
       - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
+          name: prow-job-cluster-launch-installer-e2e
         name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
index 674ec58d1f19c..509fa3e7f13c7 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
@@ -134,30 +134,40 @@ presubmits:
     always_run: true
     branches:
     - release-4.1
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-aws-scaleup-rhel7
+    optional: true
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-aws-upgrade
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
+        - name: CLUSTER_TYPE
+          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.1.yaml
               name: ci-operator-4.1-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_OPENSHIFT_ORIGIN
+          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -165,8 +175,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
+          name: job-definition
+          subPath: cluster-scaleup-e2e-40.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -177,48 +190,43 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
+          - configMap:
+              name: cluster-profile-aws-centos-40
+      - configMap:
+          name: prow-job-cluster-scaleup-e2e-40
+        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - release-4.1
-    context: ci/prow/e2e-restore-cluster-state
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-restore-cluster-state
-    optional: true
-    rerun_command: /test e2e-restore-cluster-state
+    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-restore-cluster-state
-        - --template=/usr/local/e2e-restore-cluster-state
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         env:
-        - name: CLUSTER_TYPE
-          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.1.yaml
               name: ci-operator-4.1-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-restore-cluster-state
-        - name: TEST_COMMAND
-          value: |
-            restore-cluster-state
-            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -226,11 +234,8 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-restore-cluster-state
-          name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -241,35 +246,32 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-e2e
-        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
   - agent: kubernetes
     always_run: false
     branches:
     - release-4.1
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-restore-cluster-state
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-rhel-scaleup
+    name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-restore-cluster-state
     optional: true
-    rerun_command: /test e2e-rhel-scaleup
+    rerun_command: /test e2e-restore-cluster-state
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
+        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --target=e2e-restore-cluster-state
+        - --template=/usr/local/e2e-restore-cluster-state
         command:
         - ci-operator
         env:
@@ -281,11 +283,11 @@ presubmits:
               key: openshift-machine-config-operator-release-4.1.yaml
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+          value: e2e-restore-cluster-state
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: |
+            restore-cluster-state
+            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -293,11 +295,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-restore-cluster-state
           name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
+          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -308,15 +310,13 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
       - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
+          name: prow-job-cluster-launch-installer-e2e
         name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
index af4a1bc5a81c9..8789d5f02c3d1 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
@@ -134,30 +134,40 @@ presubmits:
     always_run: true
     branches:
     - release-4.2
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-aws-scaleup-rhel7
+    optional: true
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-aws-upgrade
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
+        - name: CLUSTER_TYPE
+          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.2.yaml
               name: ci-operator-4.2-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_OPENSHIFT_ORIGIN
+          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -165,8 +175,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
+          name: job-definition
+          subPath: cluster-scaleup-e2e-40.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -177,48 +190,43 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
+          - configMap:
+              name: cluster-profile-aws-centos-40
+      - configMap:
+          name: prow-job-cluster-scaleup-e2e-40
+        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - release-4.2
-    context: ci/prow/e2e-restore-cluster-state
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-restore-cluster-state
-    optional: true
-    rerun_command: /test e2e-restore-cluster-state
+    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-restore-cluster-state
-        - --template=/usr/local/e2e-restore-cluster-state
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         env:
-        - name: CLUSTER_TYPE
-          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.2.yaml
               name: ci-operator-4.2-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-restore-cluster-state
-        - name: TEST_COMMAND
-          value: |
-            restore-cluster-state
-            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -226,11 +234,8 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-restore-cluster-state
-          name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -241,35 +246,32 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-e2e
-        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
   - agent: kubernetes
     always_run: false
     branches:
     - release-4.2
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-restore-cluster-state
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-rhel-scaleup
+    name: pull-ci-openshift-machine-config-operator-release-4.2-e2e-restore-cluster-state
     optional: true
-    rerun_command: /test e2e-rhel-scaleup
+    rerun_command: /test e2e-restore-cluster-state
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
+        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --target=e2e-restore-cluster-state
+        - --template=/usr/local/e2e-restore-cluster-state
         command:
         - ci-operator
         env:
@@ -281,11 +283,11 @@ presubmits:
               key: openshift-machine-config-operator-release-4.2.yaml
               name: ci-operator-4.2-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
+          value: e2e-restore-cluster-state
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: |
+            restore-cluster-state
+            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -293,11 +295,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-restore-cluster-state
           name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
+          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -308,15 +310,13 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
       - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
+          name: prow-job-cluster-launch-installer-e2e
         name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
index 0fdbb2d61b4a0..3b9b9dce312bd 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
@@ -134,30 +134,40 @@ presubmits:
     always_run: true
     branches:
     - release-4.3
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-aws-scaleup-rhel7
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-aws-scaleup-rhel7
+    optional: true
+    rerun_command: /test e2e-aws-scaleup-rhel7
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-aws-upgrade
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
+        - name: CLUSTER_TYPE
+          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.3.yaml
               name: ci-operator-4.3-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-scaleup-rhel7
+        - name: RPM_REPO_OPENSHIFT_ORIGIN
+          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -165,8 +175,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
+          name: job-definition
+          subPath: cluster-scaleup-e2e-40.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -177,48 +190,43 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
+          - configMap:
+              name: cluster-profile-aws-centos-40
+      - configMap:
+          name: prow-job-cluster-scaleup-e2e-40
+        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - release-4.3
-    context: ci/prow/e2e-restore-cluster-state
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-restore-cluster-state
-    optional: true
-    rerun_command: /test e2e-restore-cluster-state
+    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-restore-cluster-state
-        - --template=/usr/local/e2e-restore-cluster-state
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         env:
-        - name: CLUSTER_TYPE
-          value: aws
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
               key: openshift-machine-config-operator-release-4.3.yaml
               name: ci-operator-4.3-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-restore-cluster-state
-        - name: TEST_COMMAND
-          value: |
-            restore-cluster-state
-            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -226,11 +234,8 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-restore-cluster-state
-          name: job-definition
-          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -241,35 +246,32 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-e2e
-        name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
   - agent: kubernetes
     always_run: false
     branches:
     - release-4.3
-    context: ci/prow/e2e-rhel-scaleup
+    context: ci/prow/e2e-restore-cluster-state
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-rhel-scaleup
+    name: pull-ci-openshift-machine-config-operator-release-4.3-e2e-restore-cluster-state
     optional: true
-    rerun_command: /test e2e-rhel-scaleup
+    rerun_command: /test e2e-restore-cluster-state
     spec:
       containers:
       - args:
         - --artifact-dir=$(ARTIFACTS)
         - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
+        - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --target=e2e-restore-cluster-state
+        - --template=/usr/local/e2e-restore-cluster-state
         command:
         - ci-operator
         env:
@@ -281,11 +283,11 @@ presubmits:
               key: openshift-machine-config-operator-release-4.3.yaml
               name: ci-operator-4.3-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/
+          value: e2e-restore-cluster-state
         - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
+          value: |
+            restore-cluster-state
+            TEST_SUITE=openshift/conformance/parallel run-tests
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -293,11 +295,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-restore-cluster-state
           name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
+          subPath: cluster-launch-installer-e2e.yaml
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
@@ -308,15 +310,13 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
       - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
+          name: prow-job-cluster-launch-installer-e2e
         name: job-definition
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches: