diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
index 3c169741f32fa..3271129d36843 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.4.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.4.yaml
index e961ef28fe341..208ac1f6fc8a0 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.4.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.4.yaml
@@ -191,8 +191,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.5.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.5.yaml
index 80bb28e49ffda..1c16eab794040 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.5.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.5.yaml
@@ -196,8 +196,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml
index cb9f2735d7b68..6aa63f0f8a39d 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml
@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 045ce71386098..6f9181b43ca60 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -194,8 +194,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
index 146ec1714ded7..810a236158102 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
@@ -190,8 +190,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
index 262f8a0cd78df..560f2e8705702 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
@@ -195,8 +195,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.6.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.6.yaml
index 2ae23a935a4a4..a0196b6f9fa9e 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.6.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.6.yaml
@@ -194,8 +194,8 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer_upi:
     cluster_profile: vsphere
-- as: e2e-steps
+- as: e2e-aws-steps
   commands: ""
   steps:
     cluster_profile: aws
-    workflow: origin-e2e
+    workflow: origin-e2e-aws
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml
index 804f5fa43eadb..5a6a74b1bc86a 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml
@@ -313,6 +313,94 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-master-e2e-aws-steps
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=master
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --org=openshift-priv
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1005,94 +1093,6 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - master
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-installer-master-e2e-steps
-    path_alias: github.com/openshift/installer
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=master
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --org=openshift-priv
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.4-presubmits.yaml
index b67609a8e5ce5..6f4ac4f943b8a 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.4-presubmits.yaml
@@ -313,6 +313,94 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.4
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.4-e2e-aws-steps
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.4
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --org=openshift-priv
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -903,94 +991,6 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.4
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-installer-release-4.4-e2e-steps
-    path_alias: github.com/openshift/installer
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.4
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --org=openshift-priv
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.5-presubmits.yaml
index 2ee8ceda96135..940fcbb80f55a 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.5-presubmits.yaml
@@ -313,6 +313,94 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.5
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.5-e2e-aws-steps
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.5
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --org=openshift-priv
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1005,94 +1093,6 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.5
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-installer-release-4.5-e2e-steps
-    path_alias: github.com/openshift/installer
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.5
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --org=openshift-priv
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.6-presubmits.yaml
index 178e04b1bb0f3..3e6bf7f05fc31 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.6-presubmits.yaml
@@ -313,6 +313,94 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.6
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.6-e2e-aws-steps
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.6
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --org=openshift-priv
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1005,94 +1093,6 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.6
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-installer-release-4.6-e2e-steps
-    path_alias: github.com/openshift/installer
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.6
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --org=openshift-priv
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
index c64f64ecc1c09..e3a6d6b87f401 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -710,6 +710,87 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-master-e2e-aws-steps
+    optional: true
+    rerun_command: /test e2e-aws-steps
+    skip_report: true
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=master
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --org=openshift
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2073,87 +2154,6 @@ presubmits:
         secret:
           secretName: regcred
     trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - master
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-master-e2e-steps
-    optional: true
-    rerun_command: /test e2e-steps
-    skip_report: true
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=master
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --org=openshift
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.4-presubmits.yaml
index 93cbcc68499da..5f27850bbf77f 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.4-presubmits.yaml
@@ -710,6 +710,87 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.4
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-release-4.4-e2e-aws-steps
+    optional: true
+    rerun_command: /test e2e-aws-steps
+    skip_report: true
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.4
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --org=openshift
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1979,87 +2060,6 @@ presubmits:
         secret:
           secretName: regcred
     trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.4
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.4-e2e-steps
-    optional: true
-    rerun_command: /test e2e-steps
-    skip_report: true
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.4
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --org=openshift
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.5-presubmits.yaml
index 72689da545f4f..95076f3b7415e 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.5-presubmits.yaml
@@ -286,6 +286,85 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-scaleup-rhel7,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.5
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-release-4.5-e2e-aws-steps
+    rerun_command: /test e2e-aws-steps
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.5
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --org=openshift
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1004,85 +1083,6 @@ presubmits:
         secret:
           secretName: regcred
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.5
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.5-e2e-steps
-    rerun_command: /test e2e-steps
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.5
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --org=openshift
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.6-presubmits.yaml
index b33b4d8076e56..8fd9f2c27779b 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.6-presubmits.yaml
@@ -710,6 +710,87 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.6
+    context: ci/prow/e2e-aws-steps
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-release-4.6-e2e-aws-steps
+    optional: true
+    rerun_command: /test e2e-aws-steps
+    skip_report: true
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=release-4.6
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
+        - --lease-server-password-file=/etc/boskos/password
+        - --lease-server-username=ci
+        - --lease-server=https://boskos-ci.svc.ci.openshift.org
+        - --org=openshift
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/usr/local/e2e-aws-steps-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-steps
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-steps-cluster-profile
+          name: cluster-profile
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-steps,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2072,87 +2153,6 @@ presubmits:
         secret:
           secretName: regcred
     trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.6
-    context: ci/prow/e2e-steps
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.6-e2e-steps
-    optional: true
-    rerun_command: /test e2e-steps
-    skip_report: true
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.6
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --kubeconfig=/etc/apici/kubeconfig
-        - --lease-server-password-file=/etc/boskos/password
-        - --lease-server-username=ci
-        - --lease-server=https://boskos-ci.svc.ci.openshift.org
-        - --org=openshift
-        - --repo=installer
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --secret-dir=/usr/local/e2e-steps-cluster-profile
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=e2e-steps
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/apici
-          name: apici-ci-operator-credentials
-          readOnly: true
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/e2e-steps-cluster-profile
-          name: cluster-profile
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: apici-ci-operator-credentials
-        secret:
-          items:
-          - key: sa.ci-operator.apici.config
-            path: kubeconfig
-          secretName: apici-ci-operator-credentials
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: pull-secret
-        secret:
-          secretName: regcred
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/step-registry/ipi/conf/aws/OWNERS b/ci-operator/step-registry/ipi/conf/aws/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/ipi/conf/aws/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.yaml b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.yaml
new file mode 100644
index 0000000000000..e09e217005de5
--- /dev/null
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.yaml
@@ -0,0 +1,7 @@
+chain:
+  as: ipi-conf-aws
+  steps:
+  - ref: ipi-conf
+  - ref: ipi-conf-aws
+  documentation: |-
+    The IPI configure step chain generates the install-config.yaml file based on the cluster profile and optional input files.
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
new file mode 100755
index 0000000000000..f691997ee433c
--- /dev/null
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+CONFIG="${SHARED_DIR}/install-config.yaml"
+
+expiration_date=$(date -d '4 hours' --iso=minutes --utc)
+
+case "$((RANDOM % 4))" in
+0) aws_region=us-east-1
+   zone_1=us-east-1b
+   zone_2=us-east-1c;;
+1) aws_region=us-east-2;;
+2) aws_region=us-west-1;;
+3) aws_region=us-west-2;;
+*) echo >&2 "invalid AWS region index"; exit 1;;
+esac
+echo "AWS region: ${aws_region} (zones: ${zone_1:-${aws_region}a} ${zone_2:-${aws_region}b})"
+
+cat >> "${CONFIG}" << EOF
+baseDomain: origin-ci-int-aws.dev.rhcloud.com
+controlPlane:
+  name: master
+  platform:
+    aws:
+      zones:
+      - ${zone_1:-${aws_region}a}
+      - ${zone_2:-${aws_region}b}
+compute:
+- name: worker
+  platform:
+    aws:
+      zones:
+      - ${zone_1:-${aws_region}a}
+      - ${zone_2:-${aws_region}b}
+platform:
+  aws:
+    region: ${aws_region}
+    userTags:
+      expirationDate: ${expiration_date}
+EOF
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
new file mode 100644
index 0000000000000..051db03fadd32
--- /dev/null
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
@@ -0,0 +1,10 @@
+ref:
+  as: ipi-conf-aws
+  from: centos:7
+  commands: ipi-conf-aws-commands.sh
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+  documentation: |-
+    The IPI AWS configure step generates the AWS-specific install-config.yaml contents based on the cluster profile and optional input files.
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 527a956bcbbff..6892f6de66213 100755
--- a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
@@ -4,228 +4,22 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
-
 cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile
 cluster_name=${NAMESPACE}-${JOB_NAME_HASH}
 
 out=${SHARED_DIR}/install-config.yaml
 
-cluster_variant=
-if [[ -e "${SHARED_DIR}/install-config-variant.txt" ]]; then
-    cluster_variant=$(<"${SHARED_DIR}/install-config-variant.txt")
-fi
-
-function has_variant() {
-    regex="(^|,)$1($|,)"
-    if [[ $cluster_variant =~ $regex ]]; then
-        return 0
-    fi
-    return 1
-}
-
-base_domain=
-if [[ -e "${SHARED_DIR}/install-config-base-domain.txt" ]]; then
-    base_domain=$(<"${SHARED_DIR}/install-config-base-domain.txt")
-else
-    case "${CLUSTER_TYPE}" in
-    aws) base_domain=origin-ci-int-aws.dev.rhcloud.com;;
-    azure) base_domain=ci.azure.devcluster.openshift.com;;
-    gcp) base_domain=origin-ci-int-gce.dev.openshift.com;;
-    *) echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'"
-    esac
-fi
-
 echo "Installing from release ${RELEASE_IMAGE_LATEST}"
 
-expiration_date=$(date -d '4 hours' --iso=minutes --utc)
 ssh_pub_key=$(<"${cluster_profile}/ssh-publickey")
 pull_secret=$(<"${cluster_profile}/pull-secret")
 
-workers=3
-if has_variant compact; then
-    workers=0
-fi
-
-case "${CLUSTER_TYPE}" in
-aws)
-    case "$((RANDOM % 4))" in
-    0) aws_region=us-east-1
-       zone_1=us-east-1b
-       zone_2=us-east-1c;;
-    1) aws_region=us-east-2;;
-    2) aws_region=us-west-1;;
-    3) aws_region=us-west-2;;
-    *) echo >&2 "invalid AWS region index"; exit 1;;
-    esac
-    echo "AWS region: ${aws_region} (zones: ${zone_1:-${aws_region}a} ${zone_2:-${aws_region}b})"
-    master_type=null
-    if has_variant xlarge; then
-        master_type=m5.8xlarge
-    elif has_variant large; then
-        master_type=m5.4xlarge
-    fi
-    subnets="[]"
-    if has_variant "shared-vpc"; then
-        case "${aws_region}_$((RANDOM % 4))" in
-        us-east-1_0) subnets="['subnet-030a88e6e97101ab2','subnet-0e07763243186cac5','subnet-02c5fea7482f804fb','subnet-0291499fd1718ee01','subnet-01c4667ad446c8337','subnet-025e9043c44114baa']";;
-        us-east-1_1) subnets="['subnet-0170ee5ccdd7e7823','subnet-0d50cac95bebb5a6e','subnet-0094864467fc2e737','subnet-0daa3919d85296eb6','subnet-0ab1e11d3ed63cc97','subnet-07681ad7ce2b6c281']";;
-        us-east-1_2) subnets="['subnet-00de9462cf29cd3d3','subnet-06595d2851257b4df','subnet-04bbfdd9ca1b67e74','subnet-096992ef7d807f6b4','subnet-0b3d7ba41fc6278b2','subnet-0b99293450e2edb13']";;
-        us-east-1_3) subnets="['subnet-047f6294332aa3c1c','subnet-0c3bce80bbc2c8f1c','subnet-038c38c7d96364d7f','subnet-027a025e9d9db95ce','subnet-04d9008469025b101','subnet-02f75024b00b20a75']";;
-        us-east-2_0) subnets="['subnet-0a568760cd74bf1d7','subnet-0320ee5b3bb78863e','subnet-015658a21d26e55b7','subnet-0c3ce64c4066f37c7','subnet-0d57b6b056e1ee8f6','subnet-0b118b86d1517483a']";;
-        us-east-2_1) subnets="['subnet-0f6c106c48187d0a9','subnet-0d543986b85c9f106','subnet-05ef94f36de5ac8c4','subnet-031cdc26c71c66e83','subnet-0f1e0d62680e8b883','subnet-00e92f507a7cbd8ac']";;
-        us-east-2_2) subnets="['subnet-0310771820ebb25c7','subnet-0396465c0cb089722','subnet-02e316495d39ce361','subnet-0c5bae9b575f1b9af','subnet-0b3de1f0336c54cfe','subnet-03f164174ccbc1c60']";;
-        us-east-2_3) subnets="['subnet-045c43b4de0092f74','subnet-0a78d4ddcc6434061','subnet-0ed28342940ef5902','subnet-02229d912f99fc84f','subnet-0c9b3aaa6a1ad2030','subnet-0c93fb4760f95dbe4']";;
-        us-west-1_0) subnets="['subnet-0919ede122e5d3e46','subnet-0cf9da97d102fff0d','subnet-000378d8042931770','subnet-0c8720acadbb099fc']";;
-        us-west-1_1) subnets="['subnet-0129b0f0405beca97','subnet-073caab166af2207e','subnet-0f07362330db0ac66','subnet-007d6444690f88b33']";;
-        us-west-1_2) subnets="['subnet-09affff50a1a3a9d0','subnet-0838fdfcbe4da6471','subnet-08b9c065aefd9b8de','subnet-027fcc48c429b9865']";;
-        us-west-1_3) subnets="['subnet-0cd3dde41e1d187fe','subnet-0e78f426f8938df2d','subnet-03edeaf52c46468fa','subnet-096fb5b3a7da814c2']";;
-        us-west-2_0) subnets="['subnet-04055d49cdf149e87','subnet-0b658a04c438ef43c','subnet-015f32caeff1bd736','subnet-0c96a7bb6ac78323c','subnet-0b7387e251953bdcf','subnet-0c19695d20ce05c60']";;
-        us-west-2_1) subnets="['subnet-0483607b3e3c2514f','subnet-01139c6c5e3c1e28e','subnet-0cc9500f56a1df779','subnet-001b2c8acd2bac389','subnet-093f66b9d6deffafc','subnet-095b373699fb51212']";;
-        us-west-2_2) subnets="['subnet-057c716b8953f834a','subnet-096f21593f10b44cb','subnet-0f281491881970222','subnet-0fec3730729e452d9','subnet-0381cfcc0183cb0ba','subnet-0f1189be41a2a2a2f']";;
-        us-west-2_3) subnets="['subnet-072d00dcf02ad90a6','subnet-0ad913e4bd6ff53fa','subnet-09f90e069238e4105','subnet-064ecb1b01098ff35','subnet-068d9cdd93c0c66e6','subnet-0b7d1a5a6ae1d9adf']";;
-        *) echo >&2 "invalid subnets index"; exit 1;;
-        esac
-        echo "Subnets : ${subnets}"
-    fi
-    cat > "${out}" << EOF
-apiVersion: v1
-baseDomain: ${base_domain}
-metadata:
-  name: ${cluster_name}
-controlPlane:
-  name: master
-  replicas: 3
-  platform:
-    aws:
-      type: ${master_type}
-      zones:
-      - ${zone_1:-${aws_region}a}
-      - ${zone_2:-${aws_region}b}
-compute:
-- name: worker
-  replicas: ${workers}
-  platform:
-    aws:
-      type: m4.xlarge
-      zones:
-      - ${zone_1:-${aws_region}a}
-      - ${zone_2:-${aws_region}b}
-platform:
-  aws:
-    region: ${aws_region}
-    userTags:
-      expirationDate: ${expiration_date}
-    subnets: ${subnets}
-pullSecret: >
-  ${pull_secret}
-sshKey: |
-  ${ssh_pub_key}
-EOF
-;;
-azure4)
-    case $((RANDOM % 8)) in
-    0) azure_region=centralus;;
-    1) azure_region=centralus;;
-    2) azure_region=centralus;;
-    3) azure_region=centralus;;
-    4) azure_region=centralus;;
-    5) azure_region=eastus;;
-    6) azure_region=eastus2;;
-    7) azure_region=westus;;
-    *) echo >&2 "invalid Azure region index"; exit 1;;
-    esac
-    echo "Azure region: ${azure_region}"
-    vnetrg=""
-    vnetname=""
-    ctrlsubnet=""
-    computesubnet=""
-    if has_variant shared-vpc; then
-        vnetrg="os4-common"
-        vnetname="do-not-delete-shared-vnet-${azure_region}"
-        ctrlsubnet="subnet-1"
-        computesubnet="subnet-2"
-    fi
-    cat > "${out}" << EOF
+cat > "${out}" << EOF
 apiVersion: v1
-baseDomain: ${base_domain}
 metadata:
   name: ${cluster_name}
-controlPlane:
-  name: master
-  replicas: 3
-compute:
-- name: worker
-  replicas: ${workers}
-platform:
-  azure:
-    baseDomainResourceGroupName: os4-common
-    region: ${azure_region}
-    networkResourceGroupName: ${vnetrg}
-    virtualNetwork: ${vnetname}
-    controlPlaneSubnet: ${ctrlsubnet}
-    computeSubnet: ${computesubnet}
 pullSecret: >
   ${pull_secret}
 sshKey: |
   ${ssh_pub_key}
 EOF
-;;
-gcp)
-    gcp_region=us-east1
-    gcp_project=openshift-gce-devel-ci
-    # HACK: try to "poke" the token endpoint before the test starts
-    for i in $(seq 1 30); do
-        code="$( curl -s -o /dev/null -w "%{http_code}" https://oauth2.googleapis.com/token -X POST -d '' || echo "Failed to POST https://oauth2.googleapis.com/token with $?" 1>&2)"
-        if [[ "${code}" == "400" ]]; then
-            break
-        fi
-        echo "error: Unable to resolve https://oauth2.googleapis.com/token: $code" 1>&2
-        if [[ "${i}" == "30" ]]; then
-            echo "error: Unable to resolve https://oauth2.googleapis.com/token within timeout, exiting" 1>&2
-            exit 1
-        fi
-        sleep 1
-    done
-    network=""
-    ctrlsubnet=""
-    computesubnet=""
-    if has_variant shared-vpc; then
-        network="do-not-delete-shared-network"
-        ctrlsubnet="do-not-delete-shared-master-subnet"
-        computesubnet="do-not-delete-shared-worker-subnet"
-    fi
-    cat > "${out}" << EOF
-apiVersion: v1
-baseDomain: ${base_domain}
-metadata:
-  name: ${cluster_name}
-controlPlane:
-  name: master
-  replicas: 3
-compute:
-- name: worker
-  replicas: ${workers}
-platform:
-  gcp:
-    projectID: ${gcp_project}
-    region: ${gcp_region}
-    network: ${network}
-    controlPlaneSubnet: ${ctrlsubnet}
-    computeSubnet: ${computesubnet}
-pullSecret: >
-  ${pull_secret}
-sshKey: |
-  ${ssh_pub_key}
-EOF
-;;
-*)
-    echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'"
-    exit 1;;
-esac
-
-# TODO proxy variant
-# TODO CLUSTER_NETWORK_TYPE / ovn variant
-# TODO mirror variant
-# TODO fips variant
-# TODO CLUSTER_NETWORK_MANIFEST
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 634c10832bdde..97a5148d391db 100644
--- a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
@@ -7,4 +7,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-    The IPI configure step generates the install-config.yaml file based on the cluster profile and optional input files.
+    The IPI configure step generates the generic portions of the install-config.yaml file based on optional input files.
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 d0b9c136e6130..861e4161fb85b 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
@@ -29,10 +29,6 @@ cp "${SHARED_DIR}/install-config.yaml" "${dir}/"
 mkdir -p ~/.ssh
 cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/
 
-# TODO RELEASE_IMAGE_INITIAL / upgrade tests
-# TODO mirror variant
-# TODO manual override
-
 TF_LOG=debug openshift-install --dir="${dir}" create cluster 2>&1 | grep --line-buffered -v password &
 
 set +e
diff --git a/ci-operator/step-registry/ipi/ipi-workflow.yaml b/ci-operator/step-registry/ipi/ipi-workflow.yaml
deleted file mode 100644
index 50bd4edd577f1..0000000000000
--- a/ci-operator/step-registry/ipi/ipi-workflow.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-workflow:
-  as: ipi
-  steps:
-    pre:
-    - ref: ipi-conf
-    - chain: ipi-install
-    post:
-    - chain: ipi-deprovision
-  documentation: |-
-    The IPI workflow provides pre- and post- steps that provision and deprovision an OpenShift cluster on a target IaaS platform, allowing job authors to inject their own end-to-end test logic.
diff --git a/ci-operator/step-registry/origin/e2e/aws/OWNERS b/ci-operator/step-registry/origin/e2e/aws/OWNERS
new file mode 100644
index 0000000000000..f14198cff70e7
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e/aws/OWNERS
@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler
diff --git a/ci-operator/step-registry/origin/e2e/aws/origin-e2e-aws-workflow.yaml b/ci-operator/step-registry/origin/e2e/aws/origin-e2e-aws-workflow.yaml
new file mode 100644
index 0000000000000..a5a2ac2fa5b8b
--- /dev/null
+++ b/ci-operator/step-registry/origin/e2e/aws/origin-e2e-aws-workflow.yaml
@@ -0,0 +1,12 @@
+workflow:
+  as: origin-e2e-aws
+  steps:
+    pre:
+    - chain: ipi-conf-aws
+    - chain: ipi-install
+    test:
+    - ref: origin-e2e-test
+    post:
+    - chain: ipi-deprovision
+  documentation: |-
+    The Origin E2E AWS workflow executes the common end-to-end test suite on AWS with a default cluster configuration.
diff --git a/ci-operator/step-registry/origin/e2e/origin-e2e-workflow.yaml b/ci-operator/step-registry/origin/e2e/origin-e2e-workflow.yaml
deleted file mode 100644
index c63580da951ce..0000000000000
--- a/ci-operator/step-registry/origin/e2e/origin-e2e-workflow.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-workflow:
-  as: origin-e2e
-  steps:
-    pre:
-    - ref: ipi-conf
-    - chain: ipi-install
-    test:
-    - ref: origin-e2e-test
-    post:
-    - chain: ipi-deprovision
-  documentation: |-
-    The Origin E2E workflow executes the common end-to-end test suite.