diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
index eb9e93d2777b5..7d95210b6bd1b 100644
--- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
+++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
@@ -51,14 +51,14 @@ tests:
     make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-gcp
   steps:
-    cluster_profile: aws
-    workflow: openshift-e2e-aws
-- as: e2e-aws-upgrade
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- as: e2e-gcp-upgrade
   commands: TEST_SUITE=all run-upgrade-tests
   openshift_installer:
-    cluster_profile: aws
+    cluster_profile: gcp
     upgrade: true
 - as: e2e-aws-serial
   steps:
diff --git a/ci-operator/jobs/openshift/oauth-server/openshift-oauth-server-master-presubmits.yaml b/ci-operator/jobs/openshift/oauth-server/openshift-oauth-server-master-presubmits.yaml
index e472f0736b010..a8471120c050c 100644
--- a/ci-operator/jobs/openshift/oauth-server/openshift-oauth-server-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oauth-server/openshift-oauth-server-master-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-serial
     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-oauth-server-master-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-oauth-server-master-e2e-aws-serial
+    rerun_command: /test e2e-aws-serial
     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-aws-serial-cluster-profile
+        - --target=e2e-aws-serial
         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-aws-serial-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -62,21 +62,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-gcp
     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-oauth-server-master-e2e-aws-serial
-    rerun_command: /test e2e-aws-serial
+    name: pull-ci-openshift-oauth-server-master-e2e-gcp
+    rerun_command: /test e2e-gcp
     spec:
       containers:
       - args:
@@ -84,8 +84,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-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -98,7 +98,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -118,28 +118,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-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-aws-upgrade
+    context: ci/prow/e2e-gcp-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-oauth-server-master-e2e-aws-upgrade
-    rerun_command: /test e2e-aws-upgrade
+    name: pull-ci-openshift-oauth-server-master-e2e-gcp-upgrade
+    rerun_command: /test e2e-gcp-upgrade
     spec:
       containers:
       - args:
@@ -147,8 +149,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-gcp-upgrade-cluster-profile
+        - --target=e2e-gcp-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -161,7 +163,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -181,14 +183,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-gcp-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: