diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
index fa932f52fd611..8e7a54d436872 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
@@ -54,14 +54,14 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 zz_generated_metadata:
   branch: master
diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6.yaml
index 73091a9ff5171..32d0880a0dcd9 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6.yaml
@@ -55,14 +55,14 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 zz_generated_metadata:
   branch: release-4.6
diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7.yaml
index eeaece649ad7f..476d034840261 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7.yaml
@@ -54,14 +54,14 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 zz_generated_metadata:
   branch: release-4.7
diff --git a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml
index a1299903b5a91..a5bddeba11cff 100644
--- a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/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-cluster-bootstrap-master-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-bootstrap-master-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -21,8 +21,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,7 +35,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -55,28 +55,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-cluster-bootstrap-master-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-cluster-bootstrap-master-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -84,8 +86,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -98,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -118,14 +120,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6-presubmits.yaml
index deea5ce2abaf1..d3f6896494f3e 100644
--- a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.6-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/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-cluster-bootstrap-release-4.6-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-bootstrap-release-4.6-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -21,8 +21,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,7 +35,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -55,28 +55,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-cluster-bootstrap-release-4.6-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-cluster-bootstrap-release-4.6-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -84,8 +86,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -98,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -118,14 +120,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7-presubmits.yaml
index 56db7fde2c553..a2d9afb00a9ae 100644
--- a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.7-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/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-cluster-bootstrap-release-4.7-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-bootstrap-release-4.7-e2e
+    rerun_command: /test e2e
     spec:
       containers:
       - args:
@@ -21,8 +21,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-cluster-profile
+        - --target=e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,7 +35,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -55,28 +55,30 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-upgrade
     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-cluster-bootstrap-release-4.7-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-cluster-bootstrap-release-4.7-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -84,8 +86,8 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
-        - --target=e2e-aws-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -98,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -118,14 +120,16 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-aws
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: regcred
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: