diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml
index 5ea016fa61d0e..54dd56932f454 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml
@@ -56,7 +56,7 @@ tests:
   commands: make test-e2e
   openshift_installer_src:
     cluster_profile: aws
-- 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-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
index 20fe13a4d5823..1bc72e56a3677 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
@@ -162,23 +162,22 @@ presubmits:
     always_run: false
     branches:
     - master
-    context: ci/prow/e2e-rhel-scaleup
+    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-api-operator-master-e2e-rhel-scaleup
-    optional: true
-    rerun_command: /test e2e-rhel-scaleup
+    name: pull-ci-openshift-machine-api-operator-master-e2e-aws-scaleup-rhel7
+    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-rhel-scaleup-cluster-profile
-        - --target=e2e-rhel-scaleup
-        - --template=/usr/local/e2e-rhel-scaleup
+        - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
+        - --target=e2e-aws-scaleup-rhel7
+        - --template=/usr/local/e2e-aws-scaleup-rhel7
         command:
         - ci-operator
         env:
@@ -190,7 +189,7 @@ presubmits:
               key: openshift-machine-api-operator-master.yaml
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
-          value: e2e-rhel-scaleup
+          value: e2e-aws-scaleup-rhel7
         - name: RPM_REPO_OPENSHIFT_ORIGIN
           value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
         - name: TEST_COMMAND
@@ -202,9 +201,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/e2e-rhel-scaleup
+        - mountPath: /usr/local/e2e-aws-scaleup-rhel7
           name: job-definition
           subPath: cluster-scaleup-e2e-40.yaml
       serviceAccountName: ci-operator
@@ -219,7 +218,7 @@ presubmits:
       - configMap:
           name: prow-job-cluster-scaleup-e2e-40
         name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
+    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
   - agent: kubernetes
     always_run: true
     branches: