diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml
index 2c0813b604eae..588e04d895647 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml
@@ -35,11 +35,11 @@ tests:
   commands: go test ./...
   container:
     from: src
-- as: e2e-gcp
+- as: e2e
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-gcp-upgrade
+- as: e2e-upgrade
   commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml
index 077e3a89573d8..de2698cfc34a4 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml
@@ -35,11 +35,11 @@ tests:
   commands: go test ./...
   container:
     from: src
-- as: e2e-gcp
+- as: e2e
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-gcp-upgrade
+- as: e2e-upgrade
   commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml
index 74123a276b03e..611c33994c0e7 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml
@@ -35,11 +35,11 @@ tests:
   commands: go test ./...
   container:
     from: src
-- as: e2e-gcp
+- as: e2e
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-gcp-upgrade
+- as: e2e-upgrade
   commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml
index ef3ecf06e7b08..2fc841f26a964 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml
@@ -36,11 +36,11 @@ tests:
   commands: go test ./...
   container:
     from: src
-- as: e2e-gcp
+- as: e2e
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-gcp-upgrade
+- as: e2e-upgrade
   commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml
index e0ab8f3caa64b..f0f5974c4d23a 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml
@@ -35,11 +35,11 @@ tests:
   commands: go test ./...
   container:
     from: src
-- as: e2e-gcp
+- as: e2e
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-gcp-upgrade
+- as: e2e-upgrade
   commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests
   openshift_installer:
     cluster_profile: gcp
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml
index 65fed8065900a..68f5baefa3b3d 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-gcp
+    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-version-operator-master-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-version-operator-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-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --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-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,21 +64,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: api.ci
-    context: ci/prow/e2e-gcp-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-version-operator-master-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-cluster-version-operator-master-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -86,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-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -129,7 +129,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml
index cce62c661de64..0b80434d70331 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.4
     cluster: api.ci
-    context: ci/prow/e2e-gcp
+    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-version-operator-release-4.4-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-version-operator-release-4.4-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-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --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-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,21 +64,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.4
     cluster: api.ci
-    context: ci/prow/e2e-gcp-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-version-operator-release-4.4-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.4-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -86,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-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -129,7 +129,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml
index 77281e5a5fd8d..e0c71e78d90ad 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.5
     cluster: api.ci
-    context: ci/prow/e2e-gcp
+    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-version-operator-release-4.5-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-version-operator-release-4.5-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-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --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-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,21 +64,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.5
     cluster: api.ci
-    context: ci/prow/e2e-gcp-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-version-operator-release-4.5-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.5-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -86,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-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -129,7 +129,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml
index 4c6e6ce66d32d..559e340358588 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-gcp
+    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-version-operator-release-4.6-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-version-operator-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-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --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-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,21 +64,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.6
     cluster: api.ci
-    context: ci/prow/e2e-gcp-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-version-operator-release-4.6-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.6-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -86,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-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -129,7 +129,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml
index 4ebeca1f71cc1..ec88762dd10aa 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml
@@ -5,15 +5,15 @@ presubmits:
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-gcp
+    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-version-operator-release-4.7-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-version-operator-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-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --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-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,21 +64,21 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - release-4.7
     cluster: api.ci
-    context: ci/prow/e2e-gcp-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-version-operator-release-4.7-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.7-e2e-upgrade
+    rerun_command: /test e2e-upgrade
     spec:
       containers:
       - args:
@@ -86,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-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-upgrade-cluster-profile
+        - --target=e2e-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -100,7 +100,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -129,7 +129,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: