diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml
index b95a587a277a7..de0aa73dc813f 100644
--- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml
+++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml
@@ -35,10 +35,24 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: cincinnati-operator-e2e-aws
-  commands: make func-test
-  openshift_installer_src:
-    cluster_profile: aws
+- as: operator-e2e
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: e2e-test
+      cli: initial
+      commands: OPENSHIFT_BUILD_NAMESPACE= OPERATOR_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b make func-test
+      dependencies:
+      - env: OPERATOR_IMAGE
+        name: stable:cincinnati-operator
+      - env: GRAPH_DATA_IMAGE
+        name: stable:cincinnati-graph-data-container
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-gcp
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5.yaml
index 2ee6077da5272..55e32c4317463 100644
--- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5.yaml
+++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5.yaml
@@ -35,10 +35,24 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: cincinnati-operator-e2e-aws
-  commands: make func-test
-  openshift_installer_src:
-    cluster_profile: aws
+- as: operator-e2e
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: e2e-test
+      cli: initial
+      commands: OPENSHIFT_BUILD_NAMESPACE= OPERATOR_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b make func-test
+      dependencies:
+      - env: OPERATOR_IMAGE
+        name: stable:cincinnati-operator
+      - env: GRAPH_DATA_IMAGE
+        name: stable:cincinnati-graph-data-container
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-gcp
 zz_generated_metadata:
   branch: release-4.5
   org: openshift
diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6.yaml
index 66dc64cf17ad6..b2d838632170a 100644
--- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6.yaml
@@ -35,10 +35,24 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: cincinnati-operator-e2e-aws
-  commands: make func-test
-  openshift_installer_src:
-    cluster_profile: aws
+- as: operator-e2e
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: e2e-test
+      cli: initial
+      commands: OPENSHIFT_BUILD_NAMESPACE= OPERATOR_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b make func-test
+      dependencies:
+      - env: OPERATOR_IMAGE
+        name: stable:cincinnati-operator
+      - env: GRAPH_DATA_IMAGE
+        name: stable:cincinnati-graph-data-container
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-gcp
 zz_generated_metadata:
   branch: release-4.6
   org: openshift
diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7.yaml
index 0408fac87dd2d..46df628e6d753 100644
--- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7.yaml
@@ -36,10 +36,24 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: cincinnati-operator-e2e-aws
-  commands: make func-test
-  openshift_installer_src:
-    cluster_profile: aws
+- as: operator-e2e
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: e2e-test
+      cli: initial
+      commands: OPENSHIFT_BUILD_NAMESPACE= OPERATOR_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b make func-test
+      dependencies:
+      - env: OPERATOR_IMAGE
+        name: stable:cincinnati-operator
+      - env: GRAPH_DATA_IMAGE
+        name: stable:cincinnati-graph-data-container
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-gcp
 zz_generated_metadata:
   branch: release-4.7
   org: openshift
diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8.yaml
index 9fd715b403010..b476b5a46646c 100644
--- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8.yaml
@@ -35,10 +35,24 @@ tests:
   commands: make unit-test
   container:
     from: src
-- as: cincinnati-operator-e2e-aws
-  commands: make func-test
-  openshift_installer_src:
-    cluster_profile: aws
+- as: operator-e2e
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: e2e-test
+      cli: initial
+      commands: OPENSHIFT_BUILD_NAMESPACE= OPERATOR_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b make func-test
+      dependencies:
+      - env: OPERATOR_IMAGE
+        name: stable:cincinnati-operator
+      - env: GRAPH_DATA_IMAGE
+        name: stable:cincinnati-graph-data-container
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: openshift-e2e-gcp
 zz_generated_metadata:
   branch: release-4.8
   org: openshift
diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml
index c0120a8f22a51..c06f39d9afe14 100644
--- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml
@@ -5,34 +5,25 @@ presubmits:
     branches:
     - master
     cluster: build01
-    context: ci/prow/cincinnati-operator-e2e-aws
+    context: ci/prow/images
     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-cincinnati-operator-master-cincinnati-operator-e2e-aws
-    rerun_command: /test cincinnati-operator-e2e-aws
+    name: pull-ci-openshift-cincinnati-operator-master-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/cincinnati-operator-e2e-aws-cluster-profile
-        - --target=cincinnati-operator-e2e-aws
-        - --template=/usr/local/cincinnati-operator-e2e-aws
+        - --target=[images]
+        - --target=[release:latest]
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: cincinnati-operator-e2e-aws
-        - name: TEST_COMMAND
-          value: make func-test
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -40,14 +31,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -56,49 +39,36 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cincinnati-operator-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/operator-e2e
     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-cincinnati-operator-master-images
-    rerun_command: /test images
+    name: pull-ci-openshift-cincinnati-operator-master-operator-e2e
+    rerun_command: /test operator-e2e
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=[images]
-        - --target=[release:latest]
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -108,6 +78,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -116,13 +91,26 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5-presubmits.yaml
index 1cc9daa6a20d1..d29cde5d395a4 100644
--- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.5-presubmits.yaml
@@ -5,34 +5,25 @@ presubmits:
     branches:
     - release-4.5
     cluster: build01
-    context: ci/prow/cincinnati-operator-e2e-aws
+    context: ci/prow/images
     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-cincinnati-operator-release-4.5-cincinnati-operator-e2e-aws
-    rerun_command: /test cincinnati-operator-e2e-aws
+    name: pull-ci-openshift-cincinnati-operator-release-4.5-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/cincinnati-operator-e2e-aws-cluster-profile
-        - --target=cincinnati-operator-e2e-aws
-        - --template=/usr/local/cincinnati-operator-e2e-aws
+        - --target=[images]
+        - --target=[release:latest]
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: cincinnati-operator-e2e-aws
-        - name: TEST_COMMAND
-          value: make func-test
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -40,14 +31,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -56,49 +39,36 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cincinnati-operator-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.5
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/operator-e2e
     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-cincinnati-operator-release-4.5-images
-    rerun_command: /test images
+    name: pull-ci-openshift-cincinnati-operator-release-4.5-operator-e2e
+    rerun_command: /test operator-e2e
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=[images]
-        - --target=[release:latest]
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -108,6 +78,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -116,13 +91,26 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6-presubmits.yaml
index ca7e408f36a66..91e0ff4345835 100644
--- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.6-presubmits.yaml
@@ -5,34 +5,25 @@ presubmits:
     branches:
     - release-4.6
     cluster: build01
-    context: ci/prow/cincinnati-operator-e2e-aws
+    context: ci/prow/images
     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-cincinnati-operator-release-4.6-cincinnati-operator-e2e-aws
-    rerun_command: /test cincinnati-operator-e2e-aws
+    name: pull-ci-openshift-cincinnati-operator-release-4.6-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/cincinnati-operator-e2e-aws-cluster-profile
-        - --target=cincinnati-operator-e2e-aws
-        - --template=/usr/local/cincinnati-operator-e2e-aws
+        - --target=[images]
+        - --target=[release:latest]
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: cincinnati-operator-e2e-aws
-        - name: TEST_COMMAND
-          value: make func-test
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -40,14 +31,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -56,49 +39,36 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cincinnati-operator-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.6
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/operator-e2e
     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-cincinnati-operator-release-4.6-images
-    rerun_command: /test images
+    name: pull-ci-openshift-cincinnati-operator-release-4.6-operator-e2e
+    rerun_command: /test operator-e2e
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=[images]
-        - --target=[release:latest]
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -108,6 +78,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -116,13 +91,26 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7-presubmits.yaml
index baaa193cbc2bf..163df568729c1 100644
--- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.7-presubmits.yaml
@@ -5,34 +5,24 @@ presubmits:
     branches:
     - release-4.7
     cluster: build01
-    context: ci/prow/cincinnati-operator-e2e-aws
+    context: ci/prow/images
     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-cincinnati-operator-release-4.7-cincinnati-operator-e2e-aws
-    rerun_command: /test cincinnati-operator-e2e-aws
+    name: pull-ci-openshift-cincinnati-operator-release-4.7-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/cincinnati-operator-e2e-aws-cluster-profile
-        - --target=cincinnati-operator-e2e-aws
-        - --template=/usr/local/cincinnati-operator-e2e-aws
+        - --target=[images]
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: cincinnati-operator-e2e-aws
-        - name: TEST_COMMAND
-          value: make func-test
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -40,14 +30,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -56,48 +38,36 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cincinnati-operator-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.7
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/operator-e2e
     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-cincinnati-operator-release-4.7-images
-    rerun_command: /test images
+    name: pull-ci-openshift-cincinnati-operator-release-4.7-operator-e2e
+    rerun_command: /test operator-e2e
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=[images]
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -107,6 +77,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -115,13 +90,26 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8-presubmits.yaml
index 8494096f729a6..4e65acfdbdfad 100644
--- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-release-4.8-presubmits.yaml
@@ -5,34 +5,25 @@ presubmits:
     branches:
     - release-4.8
     cluster: build01
-    context: ci/prow/cincinnati-operator-e2e-aws
+    context: ci/prow/images
     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-cincinnati-operator-release-4.8-cincinnati-operator-e2e-aws
-    rerun_command: /test cincinnati-operator-e2e-aws
+    name: pull-ci-openshift-cincinnati-operator-release-4.8-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/cincinnati-operator-e2e-aws-cluster-profile
-        - --target=cincinnati-operator-e2e-aws
-        - --template=/usr/local/cincinnati-operator-e2e-aws
+        - --target=[images]
+        - --target=[release:latest]
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: cincinnati-operator-e2e-aws
-        - name: TEST_COMMAND
-          value: make func-test
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -40,14 +31,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/cincinnati-operator-e2e-aws
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -56,49 +39,36 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cincinnati-operator-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.8
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/operator-e2e
     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-cincinnati-operator-release-4.8-images
-    rerun_command: /test images
+    name: pull-ci-openshift-cincinnati-operator-release-4.8-operator-e2e
+    rerun_command: /test operator-e2e
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --target=[images]
-        - --target=[release:latest]
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -108,6 +78,11 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -116,13 +91,26 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: password
+            path: password
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: