diff --git a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-master.yaml b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-master.yaml
index e8a6c1e575c25..3ec9d50d782da 100644
--- a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-master.yaml
+++ b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-master.yaml
@@ -13,6 +13,10 @@ images:
   dockerfile_path: Dockerfile
   from: base
   to: test-build-roots2i
+- context_dir: simples2i
+  dockerfile_path: Dockerfile
+  from: base
+  to: test-build-simples2i
 promotion:
   name: "4.8"
   namespace: ocp
@@ -24,6 +28,15 @@ resources:
 tag_specification:
   name: "4.8"
   namespace: ocp
+tests:
+- as: e2e-aws
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-builds
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws-builds
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.8.yaml b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.8.yaml
index b49b7ef4cdbc0..1b3f5b89a661e 100644
--- a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.8.yaml
+++ b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.8.yaml
@@ -13,6 +13,10 @@ images:
   dockerfile_path: Dockerfile
   from: base
   to: test-build-roots2i
+- context_dir: simples2i
+  dockerfile_path: Dockerfile
+  from: base
+  to: test-build-simples2i
 promotion:
   disabled: true
   name: "4.8"
@@ -25,6 +29,15 @@ resources:
 tag_specification:
   name: "4.8"
   namespace: ocp
+tests:
+- as: e2e-aws
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-builds
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws-builds
 zz_generated_metadata:
   branch: release-4.8
   org: openshift
diff --git a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.9.yaml b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.9.yaml
index 75bd9dabbef17..06181e0d944d2 100644
--- a/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.9.yaml
+++ b/ci-operator/config/openshift/build-test-images/openshift-build-test-images-release-4.9.yaml
@@ -13,6 +13,10 @@ images:
   dockerfile_path: Dockerfile
   from: base
   to: test-build-roots2i
+- context_dir: simples2i
+  dockerfile_path: Dockerfile
+  from: base
+  to: test-build-simples2i
 promotion:
   name: "4.9"
   namespace: ocp
@@ -24,6 +28,15 @@ resources:
 tag_specification:
   name: "4.9"
   namespace: ocp
+tests:
+- as: e2e-aws
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-builds
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws-builds
 zz_generated_metadata:
   branch: release-4.9
   org: openshift
diff --git a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-master-presubmits.yaml b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-master-presubmits.yaml
index 116925ea69054..0080f9bdaab55 100644
--- a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-master-presubmits.yaml
@@ -1,5 +1,137 @@
 presubmits:
   openshift/build-test-images:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build01
+    context: ci/prow/e2e-aws
+    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-build-test-images-master-e2e-aws
+    rerun_command: /test e2e-aws
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-cluster-profile
+        - --target=e2e-aws
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build01
+    context: ci/prow/e2e-aws-builds
+    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-build-test-images-master-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.8-presubmits.yaml
index 4b4452692fc8b..198e9fe43f1de 100644
--- a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.8-presubmits.yaml
+++ b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.8-presubmits.yaml
@@ -1,5 +1,137 @@
 presubmits:
   openshift/build-test-images:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.8
+    cluster: build01
+    context: ci/prow/e2e-aws
+    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-build-test-images-release-4.8-e2e-aws
+    rerun_command: /test e2e-aws
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-cluster-profile
+        - --target=e2e-aws
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.8
+    cluster: build01
+    context: ci/prow/e2e-aws-builds
+    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-build-test-images-release-4.8-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.9-presubmits.yaml
index f7e1ca62bb732..123e03c23daf4 100644
--- a/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/build-test-images/openshift-build-test-images-release-4.9-presubmits.yaml
@@ -1,5 +1,137 @@
 presubmits:
   openshift/build-test-images:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-aws
+    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-build-test-images-release-4.9-e2e-aws
+    rerun_command: /test e2e-aws
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-cluster-profile
+        - --target=e2e-aws
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-aws-builds
+    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-build-test-images-release-4.9-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml
index 9a8920f7128f0..d7bad575aeed8 100644
--- a/core-services/prow/02_config/_config.yaml
+++ b/core-services/prow/02_config/_config.yaml
@@ -923,6 +923,7 @@ tide:
     - openshift/baremetal-operator
     - openshift/baremetal-runtimecfg
     - openshift/builder
+    - openshift/build-test-images
     - openshift/client-go
     - openshift/cloud-credential-operator
     - openshift/cloud-network-config-controller
@@ -1671,6 +1672,7 @@ tide:
     - openshift/baremetal-operator
     - openshift/baremetal-runtimecfg
     - openshift/builder
+    - openshift/build-test-images
     - openshift/client-go
     - openshift/cloud-credential-operator
     - openshift/cloud-network-config-controller
@@ -2031,6 +2033,7 @@ tide:
     - openshift-priv/elasticsearch-proxy
     - openshift-priv/origin-aggregated-logging
     - openshift/builder
+    - openshift/build-test-images
     - openshift/cluster-cloud-controller-manager-operator
     - openshift/cluster-logging-operator
     - openshift/cluster-samples-operator
diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml
index 83ace60dbc4f9..90200d0d3fa20 100644
--- a/core-services/prow/02_config/_plugins.yaml
+++ b/core-services/prow/02_config/_plugins.yaml
@@ -6542,6 +6542,9 @@ plugins:
   openshift/build-machinery-go:
     plugins:
     - approve
+  openshift/build-test-images:
+    plugins:
+    - approve
   openshift/builder:
     plugins:
     - approve