diff --git a/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml b/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml
index f005dfb7d582a..3e7151a9240c8 100644
--- a/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml
+++ b/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi
     namespace: ocp
     tag: "8"
-  openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
+  openshift_release_rhel-8-release-golang-1.18-openshift-4.11:
     name: release
     namespace: openshift
-    tag: rhel-8-release-golang-1.17-openshift-4.10
+    tag: rhel-8-release-golang-1.18-openshift-4.11
 build_root:
   image_stream_tag:
     name: release
@@ -16,9 +16,9 @@ images:
 - dockerfile_path: Dockerfile.ci
   from: base
   inputs:
-    openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
+    openshift_release_rhel-8-release-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.11
   to: compliance-operator
 - dockerfile_path: images/testcontent/Dockerfile.ci
   to: testcontent
diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
index 9095880da23ec..b8343e08fec9a 100644
--- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
+++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
@@ -1,12 +1,3 @@
-base_images:
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  openshift_release_golang-1.18:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
 binary_build_commands: "echo \"no build commands\" \n"
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-master.yaml b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-master.yaml
index 982e62aad0e50..c76a83e29d577 100644
--- a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-master.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.12.yaml
index 463c570b1e435..1b08a3a897630 100644
--- a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.12.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.13.yaml
index 855b9d27537e2..e3e0608494ebb 100644
--- a/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/alibaba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.13.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-master.yaml b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-master.yaml
index 51a2f65bef4df..4db33b6a0e90a 100644
--- a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-master.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-master.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer-agent
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.12.yaml b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.12.yaml
index 5f54cb584aeff..a8cab6b62f8c7 100644
--- a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.12.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer-agent
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.13.yaml b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.13.yaml
index 60a33931a238e..c5b8536ece930 100644
--- a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.13.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer-agent
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-master.yaml b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-master.yaml
index 6126dc133533e..4607c6774f8fd 100644
--- a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-master.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-master.yaml
@@ -11,18 +11,25 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.12.yaml b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.12.yaml
index 0d51ef417cb9f..c937a7c0d58ba 100644
--- a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.12.yaml
@@ -11,18 +11,25 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.13.yaml b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.13.yaml
index 8806df3f0107c..9870b6d8640e3 100644
--- a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.13.yaml
@@ -11,18 +11,25 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-installer
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-master.yaml b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-master.yaml
index 833169f13e7d5..2a2cab742a278 100644
--- a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-master.yaml
+++ b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-master.yaml
@@ -15,7 +15,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-service
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.12.yaml b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.12.yaml
index 238da66e05083..f95597fb5ee67 100644
--- a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.12.yaml
@@ -15,7 +15,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-service
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.13.yaml b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.13.yaml
index 38f8c7f748e95..9013010e85d12 100644
--- a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.13.yaml
@@ -15,7 +15,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/assisted-service
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master.yaml b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master.yaml
index 8115f1981e550..9a67b8fd035be 100644
--- a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master.yaml
@@ -56,10 +56,13 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12.yaml
index 55f44bc197438..b9e639032d2ea 100644
--- a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12.yaml
@@ -57,10 +57,13 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13.yaml
index cd17d5bdf07f0..df76dc709d302 100644
--- a/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13.yaml
@@ -56,10 +56,13 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-master.yaml b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-master.yaml
index 5d03ce434ce06..945a4e33d5e20 100644
--- a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-master.yaml
+++ b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-master.yaml
@@ -47,7 +47,7 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.12.yaml b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.12.yaml
index f228b4153c3ae..5ed195a3616bc 100644
--- a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.12.yaml
@@ -48,7 +48,7 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.13.yaml b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.13.yaml
index 8fc7c69db4ef6..f4822ee1c9116 100644
--- a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.13.yaml
@@ -47,7 +47,7 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master.yaml
deleted file mode 100644
index d4e08c627208e..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-base_images:
-  base:
-    name: 4.12-priv
-    namespace: ocp-private
-    tag: base
-  cincinnati_operand_latest:
-    name: cincinnati-build-root
-    namespace: cincinnati-ci
-    tag: deploy
-  graphdata:
-    name: cincinnati-graph-data
-    namespace: cincinnati-ci-public
-    tag: stable
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.12-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.12-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: |
-        make func-test \
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \
-        OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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
-- as: operator-e2e-latest-osus
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: make func-test OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        name: stable:cincinnati-operator
-      - env: GRAPH_DATA_IMAGE
-        name: graphdata
-      - env: RELATED_IMAGE_OPERAND
-        name: cincinnati_operand_latest
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-gcp
-zz_generated_metadata:
-  branch: master
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10.yaml
deleted file mode 100644
index 4c4b11ac61f59..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-base_images:
-  base:
-    name: 4.10-priv
-    namespace: ocp-private
-    tag: base
-  cincinnati_operand_latest:
-    name: cincinnati-build-root
-    namespace: cincinnati-ci
-    tag: deploy
-  graphdata:
-    name: cincinnati-graph-data
-    namespace: cincinnati-ci-public
-    tag: stable
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.10-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.10-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.10-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: |
-        make func-test \
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \
-        OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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
-- as: operator-e2e-latest-osus
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: make func-test OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        name: stable:cincinnati-operator
-      - env: GRAPH_DATA_IMAGE
-        name: graphdata
-      - env: RELATED_IMAGE_OPERAND
-        name: cincinnati_operand_latest
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-gcp
-zz_generated_metadata:
-  branch: release-4.10
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11.yaml
deleted file mode 100644
index c211b0f9467ca..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-base_images:
-  base:
-    name: 4.11-priv
-    namespace: ocp-private
-    tag: base
-  cincinnati_operand_latest:
-    name: cincinnati-build-root
-    namespace: cincinnati-ci
-    tag: deploy
-  graphdata:
-    name: cincinnati-graph-data
-    namespace: cincinnati-ci-public
-    tag: stable
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.11-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.11-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.11-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: |
-        make func-test \
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \
-        OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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
-- as: operator-e2e-latest-osus
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: make func-test OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        name: stable:cincinnati-operator
-      - env: GRAPH_DATA_IMAGE
-        name: graphdata
-      - env: RELATED_IMAGE_OPERAND
-        name: cincinnati_operand_latest
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-gcp
-zz_generated_metadata:
-  branch: release-4.11
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12.yaml
deleted file mode 100644
index e78f155a98b7e..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-base_images:
-  base:
-    name: 4.12-priv
-    namespace: ocp-private
-    tag: base
-  cincinnati_operand_latest:
-    name: cincinnati-build-root
-    namespace: cincinnati-ci
-    tag: deploy
-  graphdata:
-    name: cincinnati-graph-data
-    namespace: cincinnati-ci-public
-    tag: stable
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  disabled: true
-  excluded_images:
-  - cincinnati-operator
-  name: 4.12-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.12-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: |
-        make func-test \
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \
-        OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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
-- as: operator-e2e-latest-osus
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: make func-test OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        name: stable:cincinnati-operator
-      - env: GRAPH_DATA_IMAGE
-        name: graphdata
-      - env: RELATED_IMAGE_OPERAND
-        name: cincinnati_operand_latest
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-gcp
-zz_generated_metadata:
-  branch: release-4.12
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13.yaml
deleted file mode 100644
index 758a5ab03a451..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-base_images:
-  base:
-    name: 4.13-priv
-    namespace: ocp-private
-    tag: base
-  cincinnati_operand_latest:
-    name: cincinnati-build-root
-    namespace: cincinnati-ci
-    tag: deploy
-  graphdata:
-    name: cincinnati-graph-data
-    namespace: cincinnati-ci-public
-    tag: stable
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.13-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.13-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.13-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: |
-        make func-test \
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \
-        OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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
-- as: operator-e2e-latest-osus
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: make func-test OPENSHIFT_BUILD_NAMESPACE=
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        name: stable:cincinnati-operator
-      - env: GRAPH_DATA_IMAGE
-        name: graphdata
-      - env: RELATED_IMAGE_OPERAND
-        name: cincinnati_operand_latest
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-gcp
-zz_generated_metadata:
-  branch: release-4.13
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5.yaml
deleted file mode 100644
index 1c33b1602822e..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-base_images:
-  base:
-    name: 4.5-priv
-    namespace: ocp-private
-    tag: base
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.5-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.5-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.5-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- 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-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6.yaml
deleted file mode 100644
index 3791dfdd9ddb2..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-base_images:
-  base:
-    name: 4.6-priv
-    namespace: ocp-private
-    tag: base
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.6-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.6-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.6-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: OPENSHIFT_BUILD_NAMESPACE= OPERAND_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        make func-test
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7.yaml
deleted file mode 100644
index d47037780628f..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-base_images:
-  base:
-    name: 4.7-priv
-    namespace: ocp-private
-    tag: base
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.7-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.7-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.7-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: OPENSHIFT_BUILD_NAMESPACE= OPERAND_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        make func-test
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8.yaml
deleted file mode 100644
index 08313149f2b92..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-base_images:
-  base:
-    name: 4.8-priv
-    namespace: ocp-private
-    tag: base
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.8-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.8-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.8-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: OPENSHIFT_BUILD_NAMESPACE= OPERAND_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        make func-test
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9.yaml
deleted file mode 100644
index c916f50130bad..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-base_images:
-  base:
-    name: 4.9-priv
-    namespace: ocp-private
-    tag: base
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
-canonical_go_repository: github.com/openshift/cincinnati-operator
-images:
-- dockerfile_path: build/Dockerfile
-  from: base
-  to: cincinnati-operator
-- dockerfile_path: dev/Dockerfile
-  from: base
-  to: cincinnati-graph-data-container
-promotion:
-  excluded_images:
-  - cincinnati-operator
-  name: 4.9-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.9-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.9-priv
-      namespace: ocp-private
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: make unit-test
-  container:
-    from: src
-- as: operator-e2e
-  steps:
-    cluster_profile: gcp
-    test:
-    - as: e2e-test
-      cli: initial
-      commands: OPENSHIFT_BUILD_NAMESPACE= OPERAND_IMAGE=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:d1d2f881bce1a1375ec8470133ee0a912164b8a7ecce19aac24d24e623aef59b
-        make func-test
-      dependencies:
-      - env: OPERATOR_IMAGE
-        name: stable:cincinnati-operator
-      - env: RELATED_IMAGE_OPERATOR
-        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.9
-  org: openshift-priv
-  repo: cincinnati-operator
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-master.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-master.yaml
deleted file mode 100644
index e5210c7b1ae00..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-master.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.12-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.12-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: master
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10.yaml
deleted file mode 100644
index 6a40f595e15cf..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.10-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.10-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.10-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: release-4.10
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11.yaml
deleted file mode 100644
index 4ca97f75ab908..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.11-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.11-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.11-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: release-4.11
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12.yaml
deleted file mode 100644
index 9ba5daef5e236..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  disabled: true
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.12-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.12-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: release-4.12
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13.yaml
deleted file mode 100644
index 39643fa59e270..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.13-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.13-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.13-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: release-4.13
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9.yaml b/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9.yaml
deleted file mode 100644
index 2e1cd73ab323c..0000000000000
--- a/ci-operator/config/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-base_images:
-  openshift_release_golang-1.13:
-    name: release
-    namespace: openshift
-    tag: golang-1.13
-  ubi:
-    name: ubi
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.15
-canonical_go_repository: github.com/openshift/cincinnati
-images:
-- dockerfile_literal: |
-    FROM ubi
-    COPY . /opt/app-root/src/
-    WORKDIR /opt/app-root/src/cincinnati
-    USER 0
-    ENV HOME="/root"
-    ENV PATH="${HOME}/.cargo/bin:${HOME}/.local/bin:${PATH}"
-    RUN chgrp root /opt/app-root/src/cincinnati && \
-        chmod g+w /opt/app-root/src/cincinnati && \
-        dnf install -y jq python38 && \
-        dnf clean all
-    # build: Rust stable toolchain
-    RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.0 -y && \
-      rustup install 1.54.0
-    # install yamllint
-    RUN pip3 install --user yamllint
-    RUN \
-      mkdir -p $HOME/.cargo/git/ && \
-      find $HOME/. -type d -exec chmod 777 {} \; && \
-      find $HOME/. -type f -exec chmod ugo+rw {} \;
-    USER 1001
-  from: ubi
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/cincinnati
-  to: src-rust
-- dockerfile_path: dist/Dockerfile.rust-toolset/Dockerfile
-  inputs:
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: deploy
-- dockerfile_path: dist/Dockerfile.e2e-ubi8/Dockerfile
-  inputs:
-    openshift_release_golang-1.13:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.13
-    ubi:
-      as:
-      - registry.access.redhat.com/ubi8/ubi:latest
-  to: e2e-test
-promotion:
-  disabled: true
-  excluded_images:
-  - deploy
-  - e2e-test
-  - src-rust
-  name: 4.9-priv
-  namespace: ocp-private
-releases:
-  initial:
-    integration:
-      name: 4.9-priv
-      namespace: ocp-private
-  latest:
-    integration:
-      include_built_images: true
-      name: 4.9-priv
-      namespace: ocp-private
-resources:
-  '*':
-    requests:
-      cpu: 1000m
-      memory: 1Gi
-  cargo-test:
-    requests:
-      cpu: "3"
-      memory: 5Gi
-tests:
-- as: cargo-test
-  steps:
-    pre:
-    - as: prepare-credentials
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_CI_PUBLIC_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE}" dist/prepare_ci_credentials.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-private-dockercfg
-        name: cincy-private-dockercfg
-        namespace: test-credentials
-      - mount_path: /usr/local/ci-secrets/cincy-public-dockercfg
-        name: cincy-public-dockercfg
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/cincy-credentials/registry_credentials_docker.json
-        name: CINCINNATI_TEST_CREDENTIALS_PATH
-      - default: /usr/local/ci-secrets/cincy-private-dockercfg/.dockercfg
-        name: CINCINNATI_CI_DOCKERCFG_PATH
-      - default: /usr/local/ci-secrets/cincy-public-dockercfg/.dockercfg
-        name: CINCINNATI_CI_PUBLIC_DOCKERCFG_PATH
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: public-ci-image-sa-dockerjson
-        name: CINCINNATI_CI_PUBLIC_DOCKERJSON_FILE
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    test:
-    - as: cargo-test
-      commands: |
-        env CINCINNATI_CI_DOCKERJSON_PATH="${SHARED_DIR}/${CINCINNATI_CI_DOCKERJSON_FILE}" CINCINNATI_TEST_CREDENTIALS_PATH="${SHARED_DIR}/${CINCINNATI_TEST_CREDENTIALS_FILE}" dist/cargo_test.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/cincy-credentials
-        name: cincy-credentials
-        namespace: test-credentials
-      env:
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_CI_DOCKERJSON_FILE
-      - default: ci-image-sa-dockerjson
-        name: CINCINNATI_TEST_CREDENTIALS_FILE
-      - default: /usr/local/ci-secrets/cincy-credentials/quay_api_access_token.key
-        name: CINCINNATI_TEST_QUAY_API_TOKEN_PATH
-      - default: /usr/local/ci-secrets/cincy-credentials/github_token.key
-        name: CINCINNATI_GITHUB_SCRAPER_OAUTH_TOKEN_PATH
-      from: src-rust
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-- as: yaml-lint
-  commands: dist/prow_yaml_lint.sh
-  container:
-    from: src-rust
-- as: rustfmt-1.58.0
-  commands: dist/prow_rustfmt.sh 1.58.0
-  container:
-    from: src-rust
-- as: rustfmt-1.54.0
-  commands: dist/prow_rustfmt.sh 1.54.0
-  container:
-    from: src-rust
-- as: e2e
-  steps:
-    cluster_profile: aws
-    test:
-    - as: openshift-e2e-test
-      commands: bash ./hack/e2e.sh
-      dependencies:
-      - env: CINCINNATI_IMAGE
-        name: deploy
-      from: e2e-test
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: openshift-e2e-aws
-zz_generated_metadata:
-  branch: release-4.9
-  org: openshift-priv
-  repo: cincinnati
diff --git a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master.yaml b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master.yaml
index 0636806b760fe..11e84359bfd4a 100644
--- a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master.yaml
@@ -62,7 +62,7 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: cloud-credential-operator-codecov-token
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12.yaml
index 5398ac33b2090..de34bbaa29976 100644
--- a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12.yaml
@@ -63,7 +63,7 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: cloud-credential-operator-codecov-token
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13.yaml
index 75d420d7d0733..8bd52a514d535 100644
--- a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13.yaml
@@ -62,7 +62,7 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: cloud-credential-operator-codecov-token
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master.yaml
index 4f980072fb0fd..a1866de4d2d9c 100644
--- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master.yaml
+++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master.yaml
@@ -41,15 +41,15 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
@@ -66,6 +66,32 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-ovn-serial
+- as: e2e-openstack-sdn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OpenShiftSDN
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
+- as: e2e-openstack-ovn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OVNKubernetes
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
 zz_generated_metadata:
   branch: master
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12.yaml
index 3f6e331fb2886..2ff6eee72e204 100644
--- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12.yaml
@@ -42,15 +42,15 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
@@ -67,6 +67,32 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-ovn-serial
+- as: e2e-openstack-sdn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OpenShiftSDN
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
+- as: e2e-openstack-ovn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OVNKubernetes
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13.yaml
index 2672f2a7b04ce..493d15c7d6898 100644
--- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13.yaml
@@ -41,15 +41,15 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
@@ -66,6 +66,32 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-ovn-serial
+- as: e2e-openstack-sdn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OpenShiftSDN
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
+- as: e2e-openstack-ovn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OVNKubernetes
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master.yaml b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master.yaml
index 8a0238de860b0..5053aac2dcec5 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master.yaml
@@ -35,7 +35,7 @@ releases:
 resources:
   '*':
     limits:
-      memory: 4Gi
+      memory: 6Gi
     requests:
       cpu: 100m
       memory: 200Mi
@@ -44,6 +44,19 @@ tests:
   commands: make gofmt
   container:
     from: src
+- as: lint
+  commands: GOLANGCI_LINT_CACHE=/tmp/.cache GOFLAGS="-mod=readonly" make golint
+  container:
+    from: src
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: e2e-alibabacloud
+  optional: true
+  steps:
+    cluster_profile: alibabacloud
+    workflow: openshift-e2e-alibabacloud
 zz_generated_metadata:
   branch: master
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12.yaml b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12.yaml
index 0330eef1243cb..0defa5b4b852d 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12.yaml
@@ -36,7 +36,7 @@ releases:
 resources:
   '*':
     limits:
-      memory: 4Gi
+      memory: 6Gi
     requests:
       cpu: 100m
       memory: 200Mi
@@ -45,6 +45,19 @@ tests:
   commands: make gofmt
   container:
     from: src
+- as: lint
+  commands: GOLANGCI_LINT_CACHE=/tmp/.cache GOFLAGS="-mod=readonly" make golint
+  container:
+    from: src
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: e2e-alibabacloud
+  optional: true
+  steps:
+    cluster_profile: alibabacloud
+    workflow: openshift-e2e-alibabacloud
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13.yaml b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13.yaml
index 235cee1a0f875..4d7978b176470 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13.yaml
@@ -35,7 +35,7 @@ releases:
 resources:
   '*':
     limits:
-      memory: 4Gi
+      memory: 6Gi
     requests:
       cpu: 100m
       memory: 200Mi
@@ -44,6 +44,19 @@ tests:
   commands: make gofmt
   container:
     from: src
+- as: lint
+  commands: GOLANGCI_LINT_CACHE=/tmp/.cache GOFLAGS="-mod=readonly" make golint
+  container:
+    from: src
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: e2e-alibabacloud
+  optional: true
+  steps:
+    cluster_profile: alibabacloud
+    workflow: openshift-e2e-alibabacloud
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-master.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-master.yaml
index a5978e08fd7d5..aebf0897b2e78 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-master.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.12.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.12.yaml
index 07ccd3acf12d1..da5788cbd9035 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.13.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.13.yaml
index 02d3dfbbe4c81..56ee4bf06387e 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main.yaml b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main.yaml
new file mode 100644
index 0000000000000..7a8c4674d72a0
--- /dev/null
+++ b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main.yaml
@@ -0,0 +1,61 @@
+base_images:
+  base:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: base
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
+binary_build_commands: go build .
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.17
+canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
+images:
+- dockerfile_path: openshift/Dockerfile.openshift
+  from: base
+  inputs:
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
+  to: nutanix-controller-manager
+promotion:
+  name: 4.12-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-nutanix
+  steps:
+    cluster_profile: nutanix
+    workflow: openshift-e2e-nutanix
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: fmt
+  commands: test -z $(gofmt -l $(find . -type f -name '*.go'| grep -v "/vendor/"))
+  container:
+    from: src
+zz_generated_metadata:
+  branch: main
+  org: openshift-priv
+  repo: cloud-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12.yaml b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12.yaml
new file mode 100644
index 0000000000000..e194d2c9de41c
--- /dev/null
+++ b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12.yaml
@@ -0,0 +1,62 @@
+base_images:
+  base:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: base
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
+binary_build_commands: go build .
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.17
+canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
+images:
+- dockerfile_path: openshift/Dockerfile.openshift
+  from: base
+  inputs:
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
+  to: nutanix-controller-manager
+promotion:
+  disabled: true
+  name: 4.12-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-nutanix
+  steps:
+    cluster_profile: nutanix
+    workflow: openshift-e2e-nutanix
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: fmt
+  commands: test -z $(gofmt -l $(find . -type f -name '*.go'| grep -v "/vendor/"))
+  container:
+    from: src
+zz_generated_metadata:
+  branch: release-4.12
+  org: openshift-priv
+  repo: cloud-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13.yaml b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13.yaml
new file mode 100644
index 0000000000000..ff61e3adccc7c
--- /dev/null
+++ b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13.yaml
@@ -0,0 +1,61 @@
+base_images:
+  base:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: base
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
+binary_build_commands: go build .
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.17
+canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
+images:
+- dockerfile_path: openshift/Dockerfile.openshift
+  from: base
+  inputs:
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
+  to: nutanix-controller-manager
+promotion:
+  name: 4.13-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.13-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.13-priv
+      namespace: ocp-private
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-nutanix
+  steps:
+    cluster_profile: nutanix
+    workflow: openshift-e2e-nutanix
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: fmt
+  commands: test -z $(gofmt -l $(find . -type f -name '*.go'| grep -v "/vendor/"))
+  container:
+    from: src
+zz_generated_metadata:
+  branch: release-4.13
+  org: openshift-priv
+  repo: cloud-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml
index ac84ea96d2f80..1a229c951a589 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   name: 4.12-priv
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12.yaml
index 672e6aaaad48a..7f0181be0533b 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   disabled: true
@@ -46,7 +46,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13.yaml
index 827413130f2e9..4e341d55f53f5 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   name: 4.13-priv
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
index db3bda610f6e7..1bc0e4ce39709 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12.yaml
index 840f8f6ce8ea9..1d0e00058d5d3 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12.yaml
@@ -46,7 +46,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13.yaml
index f361ad7f1e76f..aea595483e397 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13.yaml
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master.yaml
index 000ef8a7a3503..cdc4487e51175 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,19 +27,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-baremetal-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   name: 4.12-priv
@@ -96,10 +92,13 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.10.yaml
index 9d45d42eda104..5c00962afcea7 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.11.yaml
index 0e558fe18ecc4..71de293e366ef 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12.yaml
index 6fc8dabaf747c..71c924875f439 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,19 +27,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-baremetal-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   disabled: true
@@ -97,10 +93,13 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13.yaml
index c724b6019f0ad..90dbd5bb56cb3 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,19 +27,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-baremetal-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   name: 4.13-priv
@@ -96,10 +92,13 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.7.yaml
index 5c8f34e066345..dddc30d0ca5f4 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.8.yaml
index 0385f28783fe0..26edcc31fefcf 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.9.yaml
index b9bafd5dbbb14..39b5ddfa6bedb 100644
--- a/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-master.yaml
index 7c6c5515ca8cf..63871934feeaf 100644
--- a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-master.yaml
@@ -12,7 +12,8 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-cloud-controller-manager-operator
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.12.yaml
index 8372bc3bb1cea..915f403943a27 100644
--- a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.12.yaml
@@ -12,7 +12,8 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-cloud-controller-manager-operator
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.13.yaml
index f535b237f1f00..b4b452a6472ee 100644
--- a/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-cloud-controller-manager-operator/openshift-priv-cluster-cloud-controller-manager-operator-release-4.13.yaml
@@ -12,7 +12,8 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-cloud-controller-manager-operator
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master.yaml
index 408d310be1dba..44a011389dc9f 100644
--- a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master.yaml
@@ -55,7 +55,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12.yaml
index 38af2f0562bf0..52f0a31dbcb4f 100644
--- a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12.yaml
@@ -56,7 +56,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13.yaml
index d85600750929a..03935eaa0e026 100644
--- a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13.yaml
@@ -55,7 +55,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
index 7b82bf9682bde..611579bb687bf 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
@@ -3,23 +3,20 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.11
+  from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   name: 4.12-priv
@@ -66,7 +63,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12.yaml
index 4b8740edd9cdf..9ec2a268d39e6 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12.yaml
@@ -3,23 +3,20 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.11
+  from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   disabled: true
@@ -67,7 +64,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13.yaml
index 47aecab04c666..8778138354efd 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13.yaml
@@ -3,23 +3,20 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.11
+  from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   name: 4.13-priv
@@ -66,7 +63,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master.yaml
index 0df717905469c..c59af0a9f627c 100644
--- a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master.yaml
@@ -44,7 +44,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12.yaml
index 716789cc67da8..f94a14a670c0a 100644
--- a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12.yaml
@@ -45,7 +45,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13.yaml
index 6f7b9d5f401f1..c55b92569445d 100644
--- a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13.yaml
@@ -44,7 +44,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml
index 9d9813500174c..22190e5c7525d 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -122,6 +124,7 @@ tests:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,21 +139,25 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -160,11 +167,13 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ipv4
 - as: e2e-metal-ipi-ovn-ipv6
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -174,24 +183,29 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -201,6 +215,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10.yaml
index 16ac9919e42cf..6dc4c427e7173 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -118,10 +120,12 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,21 +140,25 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -160,11 +168,13 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ipv4
 - as: e2e-metal-ipi-ovn-ipv6
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -174,24 +184,29 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -201,6 +216,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11.yaml
index 00b71f1059aff..b717af088df39 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -118,10 +120,12 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,21 +140,25 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -160,11 +168,13 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ipv4
 - as: e2e-metal-ipi-ovn-ipv6
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -174,24 +184,29 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -201,6 +216,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -210,6 +226,7 @@ tests:
       TEST_UPGRADE_OPTIONS: ""
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-serial
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12.yaml
index 9b294f24d4f39..a42ba6eef7d7e 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -84,30 +80,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -123,6 +125,7 @@ tests:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -137,21 +140,25 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -161,11 +168,13 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ipv4
 - as: e2e-metal-ipi-ovn-ipv6
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -175,24 +184,29 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -202,6 +216,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13.yaml
index 232595cdbec87..a406c66c5c7ed 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -122,6 +124,7 @@ tests:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,21 +139,25 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -160,11 +167,13 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ipv4
 - as: e2e-metal-ipi-ovn-ipv6
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     env:
@@ -174,24 +183,29 @@ tests:
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -201,6 +215,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.6.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.6.yaml
index 9add3142026bb..84a398d3aed45 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.7.yaml
index fadb21d525fe0..6d275520c3547 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8.yaml
index 29f4f0dacb521..4aff8ca14ddba 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -118,10 +120,12 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,43 +140,52 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -180,6 +193,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9.yaml
index 762cccec741c1..6bbc6897b3174 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -83,30 +79,36 @@ tests:
   container:
     from: test-bin
 - as: e2e-agnostic
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-agnostic-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption
 - as: e2e-aws-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-disruption-ovn
 - as: e2e-gcp-disruptive
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -118,10 +120,12 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
 - as: e2e-operator
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     test:
@@ -136,45 +140,54 @@ tests:
     workflow: ipi-aws
 - as: e2e-aws
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
 - as: e2e-azure
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-gcp
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-metal-ipi
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e
 - as: e2e-metal-assisted
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-assisted
     workflow: assisted-baremetal
 - as: e2e-aws-single-node
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-single-node
 - as: e2e-metal-single-node-live-iso
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: packet-sno
     workflow: baremetalds-sno
 - as: configmap-scale
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-perfscale-e2e-configmap-scale
 - as: e2e-gcp-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
@@ -182,6 +195,7 @@ tests:
     workflow: openshift-e2e-gcp
 - as: e2e-gcp-upgrade-five-control-plane-replicas
   optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     env:
diff --git a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master.yaml
index 94595500f0670..4c96a387df7e1 100644
--- a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master.yaml
@@ -90,7 +90,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
   steps:
diff --git a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12.yaml
index 00b2bb2f35cb5..05eb265061c1e 100644
--- a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12.yaml
@@ -91,7 +91,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
   steps:
diff --git a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13.yaml
index a9934ac99a671..84a0fed547c79 100644
--- a/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13.yaml
@@ -90,7 +90,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
   steps:
diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml
index 6aa544d46020e..1d402fd4aedef 100644
--- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml
@@ -71,7 +71,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp-serial
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12.yaml
index a3643782da5fb..23ff246f130fa 100644
--- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12.yaml
@@ -72,7 +72,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp-serial
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13.yaml
index 92582d3cc815f..91b9d04985886 100644
--- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13.yaml
@@ -71,7 +71,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp-serial
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
index d2c6c18527d5c..f79762ab41631 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
@@ -213,6 +213,45 @@ tests:
   container:
     clone: true
     from: golangci-lint
+- as: e2e-network-mtu-migration-ovn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-ovn
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-ovn-ipv6
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      MTU_DECREASE: "100"
+      MTU_INCREASE: "50"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - chain: baremetalds-ipi-test
+    workflow: baremetalds-e2e-ovn-ipv6
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-sdn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-sdn
+  timeout: 5h0m0s
 zz_generated_metadata:
   branch: master
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml
index e23eb7251ffb9..d740b15895a9b 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml
@@ -214,6 +214,45 @@ tests:
   container:
     clone: true
     from: golangci-lint
+- as: e2e-network-mtu-migration-ovn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-ovn
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-ovn-ipv6
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      MTU_DECREASE: "100"
+      MTU_INCREASE: "50"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - chain: baremetalds-ipi-test
+    workflow: baremetalds-e2e-ovn-ipv6
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-sdn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-sdn
+  timeout: 5h0m0s
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13.yaml
index 023d9bca82b80..c1f5629ed6546 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13.yaml
@@ -213,6 +213,45 @@ tests:
   container:
     clone: true
     from: golangci-lint
+- as: e2e-network-mtu-migration-ovn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-ovn
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-ovn-ipv6
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      MTU_DECREASE: "100"
+      MTU_INCREASE: "50"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - chain: baremetalds-ipi-test
+    workflow: baremetalds-e2e-ovn-ipv6
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-sdn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-sdn
+  timeout: 5h0m0s
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master.yaml
index a555a0744d7a4..786f26aebbff4 100644
--- a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12.yaml
index b446fb38d6758..bc8636c1a84eb 100644
--- a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13.yaml
index 3af2fb98f3d8c..3190a614f6e42 100644
--- a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master.yaml
index ba4233b8a7536..26f9b18d7d42a 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master.yaml
@@ -48,7 +48,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12.yaml
index 4f56e9e24a9c7..e7216c867da9e 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12.yaml
@@ -49,7 +49,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13.yaml
index fc3086a6e1eab..eab1adaea601e 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13.yaml
@@ -48,7 +48,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml
index dd1c517cccd64..2043d6055ed7f 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml
@@ -50,7 +50,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml
index de8ebdd60fa3b..b5d7cd07af800 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml
@@ -51,7 +51,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml
index 85ba08e584243..e3a03af7732b8 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml
@@ -50,7 +50,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master.yaml
index b7e4371d7d51a..3439f2b4a65ab 100644
--- a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master.yaml
@@ -3,19 +3,19 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-storage-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   name: 4.12-priv
@@ -44,7 +44,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
@@ -57,7 +57,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -86,7 +86,7 @@ tests:
       TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
         on the same node
     workflow: openshift-e2e-vsphere-csi
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   steps:
     cluster_profile: azure4
diff --git a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12.yaml
index f640217a1fc0a..66423e1224030 100644
--- a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12.yaml
@@ -3,19 +3,19 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-storage-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   disabled: true
@@ -45,7 +45,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
@@ -58,7 +58,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -87,7 +87,7 @@ tests:
       TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
         on the same node
     workflow: openshift-e2e-vsphere-csi
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   steps:
     cluster_profile: azure4
diff --git a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13.yaml
index 66b4c0d653664..51bf55adf87d4 100644
--- a/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13.yaml
@@ -3,19 +3,19 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-storage-operator
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   name: 4.13-priv
@@ -44,7 +44,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
@@ -57,7 +57,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -86,7 +86,7 @@ tests:
       TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
         on the same node
     workflow: openshift-e2e-vsphere-csi
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   steps:
     cluster_profile: azure4
diff --git a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml
index ed5d80040f81d..9b8d29a2a8aaa 100644
--- a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml
@@ -80,13 +80,18 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
+    workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
   branch: master
diff --git a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12.yaml
index a8d16c3ec1e3c..06d4611a06533 100644
--- a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12.yaml
@@ -81,13 +81,18 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
+    workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
   branch: release-4.12
diff --git a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13.yaml
index 8cb7a26733e5f..a2000e9edb0fd 100644
--- a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13.yaml
@@ -80,13 +80,18 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
+    workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
   branch: release-4.13
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-master.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-master.yaml
index 37b5157abd525..0d756cb839c5e 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-master.yaml
@@ -58,7 +58,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -77,6 +77,7 @@ tests:
       resources:
         requests:
           cpu: 100m
+      timeout: 3h0m0s
     workflow: ipi-aws
 - as: e2e-aws-single-node
   optional: true
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.10.yaml
index c685bf7317cbd..67b3e05ece9a8 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.10.yaml
@@ -77,6 +77,7 @@ tests:
       resources:
         requests:
           cpu: 100m
+      timeout: 3h0m0s
     workflow: ipi-aws
 - as: e2e-aws-single-node
   optional: true
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.11.yaml
index 41a42d5c8f4b7..9445f41507021 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.11.yaml
@@ -77,6 +77,7 @@ tests:
       resources:
         requests:
           cpu: 100m
+      timeout: 3h0m0s
     workflow: ipi-aws
 - as: e2e-aws-single-node
   optional: true
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12.yaml
index 7ebfe4577773b..e39227e8fdcb8 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12.yaml
@@ -59,7 +59,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -78,6 +78,7 @@ tests:
       resources:
         requests:
           cpu: 100m
+      timeout: 3h0m0s
     workflow: ipi-aws
 - as: e2e-aws-single-node
   optional: true
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13.yaml
index 461879573b99f..01b24a4b00e55 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13.yaml
@@ -58,7 +58,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -77,6 +77,7 @@ tests:
       resources:
         requests:
           cpu: 100m
+      timeout: 3h0m0s
     workflow: ipi-aws
 - as: e2e-aws-single-node
   optional: true
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-master.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-master.yaml
index 46e7085b45a79..2fa3eb3198802 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-master.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-master.yaml
@@ -81,7 +81,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-      timeout: 2h30m0s
+      timeout: 3h0m0s
     workflow: ipi-gcp
 - as: ceph-storage-plugin
   run_if_changed: frontend/packages/ceph-storage-plugin
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.10.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.10.yaml
index c3c7102d86e1b..51a37786e5cf5 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.10.yaml
@@ -71,7 +71,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-      timeout: 2h30m0s
+      timeout: 3h0m0s
     workflow: ipi-gcp
 - as: kubevirt-plugin
   run_if_changed: frontend/packages/kubevirt-plugin
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.11.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.11.yaml
index 2fb4b357f2098..e0f18e920e856 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.11.yaml
@@ -81,7 +81,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-      timeout: 2h30m0s
+      timeout: 3h0m0s
     workflow: ipi-gcp
 - as: kubevirt-plugin
   run_if_changed: frontend/packages/kubevirt-plugin
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.12.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.12.yaml
index 8a3cfcf766bae..5afb86e05b863 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.12.yaml
@@ -82,7 +82,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-      timeout: 2h30m0s
+      timeout: 3h0m0s
     workflow: ipi-gcp
 - as: ceph-storage-plugin
   run_if_changed: frontend/packages/ceph-storage-plugin
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.13.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.13.yaml
index 41dfb536cc01e..73f344fc43b2c 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.13.yaml
@@ -81,7 +81,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-      timeout: 2h30m0s
+      timeout: 3h0m0s
     workflow: ipi-gcp
 - as: ceph-storage-plugin
   run_if_changed: frontend/packages/ceph-storage-plugin
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-master.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-master.yaml
index 79b6a0068d5c2..94505a80b7c07 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-master.yaml
@@ -14,8 +14,7 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.12.yaml
index edeedfde6a670..ae9bb22dd6223 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.12.yaml
@@ -14,8 +14,7 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.13.yaml
index b56991f504e08..418386aa9ae50 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.13.yaml
@@ -14,8 +14,7 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-master.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-master.yaml
index 6044a7e327627..b92b593027343 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-master.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-master.yaml
@@ -16,8 +16,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.12.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.12.yaml
index 6a77aa778cdbc..2e15bcc6e4e18 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.12.yaml
@@ -16,8 +16,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.13.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.13.yaml
index 1153e5b4ac77d..a40da2b6c5bee 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.13.yaml
@@ -16,8 +16,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml
index 5822db4caa24d..6794ccff7ab18 100644
--- a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
@@ -23,14 +19,10 @@ images:
 operator:
   bundles:
   - as: file-integrity-operator-bundle
-    base_index: operator-index
     context_dir: .
     dockerfile_path: bundle.Dockerfile
-    update_graph: replaces
   substitutions:
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
-    with: pipeline:file-integrity-operator
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
+  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.30
     with: pipeline:file-integrity-operator
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.12.yaml
index 2ab6e9e065a4a..82451cd414919 100644
--- a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.12.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
@@ -23,14 +19,10 @@ images:
 operator:
   bundles:
   - as: file-integrity-operator-bundle
-    base_index: operator-index
     context_dir: .
     dockerfile_path: bundle.Dockerfile
-    update_graph: replaces
   substitutions:
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
-    with: pipeline:file-integrity-operator
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
+  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.30
     with: pipeline:file-integrity-operator
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.13.yaml
index 1be335305e743..0ad541c96944e 100644
--- a/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.13.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
@@ -23,14 +19,10 @@ images:
 operator:
   bundles:
   - as: file-integrity-operator-bundle
-    base_index: operator-index
     context_dir: .
     dockerfile_path: bundle.Dockerfile
-    update_graph: replaces
   substitutions:
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
-    with: pipeline:file-integrity-operator
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
+  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.30
     with: pipeline:file-integrity-operator
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml
index 188fb36b3c7d2..cafdef01cb644 100644
--- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml
@@ -1,15 +1,86 @@
 base_images:
+  attacher-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-attacher
   base:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
+  driver-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: gcp-filestore-csi-driver
+  livenessprobe-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-livenessprobe
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.10
+  provisioner-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-provisioner
+  proxy-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: kube-rbac-proxy
+  registrar-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-node-driver-registrar
+  resizer-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-resizer
+  snapshotter-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-snapshotter
 binary_build_commands: make
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
+  from_repository: true
 canonical_go_repository: github.com/openshift/gcp-filestore-csi-driver-operator
+images:
+- dockerfile_path: Dockerfile.openshift
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: gcp-filestore-csi-driver-operator
+operator:
+  bundles:
+  - as: gcp-filestore-csi-driver-operator-bundle
+    base_index: operator-index
+    context_dir: config
+    dockerfile_path: bundle.Dockerfile
+    update_graph: replaces
+  substitutions:
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver-operator:latest
+    with: pipeline:gcp-filestore-csi-driver-operator
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver:latest
+    with: pipeline:driver-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:provisioner-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:attacher-operand
+  - pullspec: quay.io/openshift/origin-csi-external-snapshotter:latest
+    with: pipeline:snapshotter-operand
+  - pullspec: quay.io/openshift/origin-csi-external-resizer:latest
+    with: pipeline:resizer-operand
+  - pullspec: quay.io/openshift/origin-csi-node-driver-registrar:latest
+    with: pipeline:registrar-operand
+  - pullspec: quay.io/openshift/origin-csi-livenessprobe:latest
+    with: pipeline:livenessprobe-operand
+  - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
+    with: pipeline:proxy-operand
 promotion:
   name: 4.12-priv
   namespace: ocp-private
@@ -32,10 +103,26 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: unit
-  commands: make test-unit
+- as: verify
+  commands: make verify
   container:
     from: src
+- as: operator-e2e
+  optional: true
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
 zz_generated_metadata:
   branch: main
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml
index 4c00b072631f6..32137ccea23f1 100644
--- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml
@@ -1,15 +1,86 @@
 base_images:
+  attacher-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-attacher
   base:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
+  driver-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: gcp-filestore-csi-driver
+  livenessprobe-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-livenessprobe
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.10
+  provisioner-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-provisioner
+  proxy-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: kube-rbac-proxy
+  registrar-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-node-driver-registrar
+  resizer-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-resizer
+  snapshotter-operand:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: csi-external-snapshotter
 binary_build_commands: make
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
+  from_repository: true
 canonical_go_repository: github.com/openshift/gcp-filestore-csi-driver-operator
+images:
+- dockerfile_path: Dockerfile.openshift
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: gcp-filestore-csi-driver-operator
+operator:
+  bundles:
+  - as: gcp-filestore-csi-driver-operator-bundle
+    base_index: operator-index
+    context_dir: config
+    dockerfile_path: bundle.Dockerfile
+    update_graph: replaces
+  substitutions:
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver-operator:latest
+    with: pipeline:gcp-filestore-csi-driver-operator
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver:latest
+    with: pipeline:driver-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:provisioner-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:attacher-operand
+  - pullspec: quay.io/openshift/origin-csi-external-snapshotter:latest
+    with: pipeline:snapshotter-operand
+  - pullspec: quay.io/openshift/origin-csi-external-resizer:latest
+    with: pipeline:resizer-operand
+  - pullspec: quay.io/openshift/origin-csi-node-driver-registrar:latest
+    with: pipeline:registrar-operand
+  - pullspec: quay.io/openshift/origin-csi-livenessprobe:latest
+    with: pipeline:livenessprobe-operand
+  - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
+    with: pipeline:proxy-operand
 promotion:
   disabled: true
   name: 4.12-priv
@@ -33,10 +104,26 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: unit
-  commands: make test-unit
+- as: verify
+  commands: make verify
   container:
     from: src
+- as: operator-e2e
+  optional: true
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml
index cb2acb75f8e67..19eab9d48e325 100644
--- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml
@@ -1,15 +1,86 @@
 base_images:
+  attacher-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-external-attacher
   base:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
+  driver-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: gcp-filestore-csi-driver
+  livenessprobe-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-livenessprobe
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.10
+  provisioner-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-external-provisioner
+  proxy-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: kube-rbac-proxy
+  registrar-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-node-driver-registrar
+  resizer-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-external-resizer
+  snapshotter-operand:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: csi-external-snapshotter
 binary_build_commands: make
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
+  from_repository: true
 canonical_go_repository: github.com/openshift/gcp-filestore-csi-driver-operator
+images:
+- dockerfile_path: Dockerfile.openshift
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: gcp-filestore-csi-driver-operator
+operator:
+  bundles:
+  - as: gcp-filestore-csi-driver-operator-bundle
+    base_index: operator-index
+    context_dir: config
+    dockerfile_path: bundle.Dockerfile
+    update_graph: replaces
+  substitutions:
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver-operator:latest
+    with: pipeline:gcp-filestore-csi-driver-operator
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver:latest
+    with: pipeline:driver-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:provisioner-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:attacher-operand
+  - pullspec: quay.io/openshift/origin-csi-external-snapshotter:latest
+    with: pipeline:snapshotter-operand
+  - pullspec: quay.io/openshift/origin-csi-external-resizer:latest
+    with: pipeline:resizer-operand
+  - pullspec: quay.io/openshift/origin-csi-node-driver-registrar:latest
+    with: pipeline:registrar-operand
+  - pullspec: quay.io/openshift/origin-csi-livenessprobe:latest
+    with: pipeline:livenessprobe-operand
+  - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
+    with: pipeline:proxy-operand
 promotion:
   name: 4.13-priv
   namespace: ocp-private
@@ -32,10 +103,26 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: unit
-  commands: make test-unit
+- as: verify
+  commands: make verify
   container:
     from: src
+- as: operator-e2e
+  optional: true
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml
index 51e9fb23e9937..af09676bdff30 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -70,12 +66,16 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true
-      name: 4.11-priv
+      name: 4.12-priv
       namespace: ocp-private
+  previous:
+    release:
+      channel: stable
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -95,15 +95,11 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+- as: e2e-aws
+  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+  steps:
+    workflow: hypershift-aws-e2e-nested
 - as: e2e-aws-metrics
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
   optional: true
   steps:
     workflow: hypershift-aws-e2e-metrics
@@ -133,6 +129,8 @@ tests:
   optional: true
   steps:
     cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     test:
     - as: deploy-cnv
       cli: latest
@@ -148,7 +146,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -183,6 +181,10 @@ tests:
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: gcp
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
+    env:
+      COMPUTE_NODE_TYPE: n2-standard-4
     test:
     - as: deploy-cnv
       cli: latest
@@ -198,7 +200,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -228,10 +230,6 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp-ovn
-- as: e2e-aws-nested
-  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
-  steps:
-    workflow: hypershift-aws-e2e-nested
 zz_generated_metadata:
   branch: main
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10.yaml
index f11d4387eef10..974637bb09367 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10.yaml
@@ -3,23 +3,14 @@ base_images:
     name: 4.10-priv
     namespace: ocp-private
     tag: base
-  cli:
-    name: 4.10-priv
-    namespace: ocp-private
-    tag: cli
   ocp_builder_rhel-8-golang-1.17-openshift-4.10:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.17-openshift-4.10
-  openshift-tests:
-    name: 4.10-priv
-    namespace: ocp-private
-    tag: tests
   openshift_release_golang-1.17:
     name: release
     namespace: openshift
     tag: golang-1.17
-binary_build_commands: make build
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/hypershift
@@ -44,12 +35,6 @@ promotion:
   name: 4.10-priv
   namespace: ocp-private
 releases:
-  hosted-ocp-previous:
-    candidate:
-      product: ocp
-      relative: 1
-      stream: nightly
-      version: "4.10"
   latest:
     integration:
       include_built_images: true
@@ -62,7 +47,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-test_binary_build_commands: make build e2e
 tests:
 - as: verify
   commands: make verify
@@ -72,495 +56,6 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
-  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
-  steps:
-    test:
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift-private
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: |-
-        bin/test-e2e \
-          -test.v \
-          -test.timeout=0 \
-          -test.run=TestUpgradeControlPlane \
-          --e2e.aws-credentials-file=/etc/hypershift-pool-aws-credentials/credentials \
-          --e2e.pull-secret-file=/etc/ci-pull-credentials/.dockerconfigjson \
-          --e2e.base-domain=ci.hypershift.devcluster.openshift.com \
-          --e2e.latest-release-image=${OCP_IMAGE_LATEST} \
-          --e2e.previous-release-image=${OCP_IMAGE_PREVIOUS} \
-          --e2e.additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-          --e2e.control-plane-operator-image=${HYPERSHIFT_RELEASE_LATEST} \
-          --e2e.aws-endpoint-access=PublicAndPrivate
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: test-bin
-      grace_period: 30m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 1h0m0s
-    workflow: generic-claim
-- as: e2e-aws-all
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
-  optional: true
-  steps:
-    test:
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: |-
-        bin/test-e2e \
-          -test.v \
-          -test.timeout=0 \
-          --e2e.aws-credentials-file=/etc/hypershift-pool-aws-credentials/credentials \
-          --e2e.pull-secret-file=/etc/ci-pull-credentials/.dockerconfigjson \
-          --e2e.base-domain=ci.hypershift.devcluster.openshift.com \
-          --e2e.latest-release-image=${OCP_IMAGE_LATEST} \
-          --e2e.previous-release-image=${OCP_IMAGE_PREVIOUS} \
-          --e2e.additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-          --e2e.control-plane-operator-image=${HYPERSHIFT_RELEASE_LATEST} \
-          --e2e.aws-endpoint-access=PublicAndPrivate
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: test-bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 2h0m0s
-    workflow: generic-claim
-- as: e2e-aws-metrics
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
-  optional: true
-  steps:
-    test:
-    - as: setup-monitoring
-      commands: |-
-        bin/test-setup monitoring \
-          --remote-write-url=$(cat /etc/grafana-prom-push/url) \
-          --remote-write-username-file=/etc/grafana-prom-push/username \
-          --remote-write-password-file=/etc/grafana-prom-push/password
-      credentials:
-      - mount_path: /etc/grafana-prom-push
-        name: hypershift-sjenning-homelab-push
-        namespace: test-credentials
-      from: test-bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 2m0s
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: |-
-        bin/test-e2e \
-          -test.v \
-          -test.timeout=0 \
-          -test.run=TestUpgradeControlPlane \
-          --e2e.aws-credentials-file=/etc/hypershift-pool-aws-credentials/credentials \
-          --e2e.pull-secret-file=/etc/ci-pull-credentials/.dockerconfigjson \
-          --e2e.base-domain=ci.hypershift.devcluster.openshift.com \
-          --e2e.latest-release-image=${OCP_IMAGE_LATEST} \
-          --e2e.previous-release-image=${OCP_IMAGE_PREVIOUS} \
-          --e2e.additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-          --e2e.control-plane-operator-image=${HYPERSHIFT_RELEASE_LATEST} \
-          --e2e.aws-endpoint-access=PublicAndPrivate
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: test-bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 1h0m0s
-    workflow: generic-claim
-- as: e2e-conformance
-  optional: true
-  steps:
-    post:
-    - as: dump-guest-cluster
-      cli: latest
-      commands: |-
-        export KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
-        bin/hypershift dump cluster --artifact-dir=$ARTIFACT_DIR \
-        --name="$(echo -n $PROW_JOB_ID|cut -d- -f-2)"
-      from: bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-    - as: destroy-guest-cluster
-      cli: latest
-      commands: |-
-        export KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
-        bin/hypershift destroy cluster aws \
-        --aws-creds=/etc/hypershift-pool-aws-credentials/credentials  \
-        --name="$(echo -n $PROW_JOB_ID|cut -d- -f-2)"
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      from: bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-    - as: destroy-management-cluster
-      cli: latest
-      commands: |-
-        export KUBECONFIG=/etc/hypershift-kubeconfig/kubeconfig
-        bin/hypershift destroy cluster aws \
-        --aws-creds=/etc/hypershift-pool-aws-credentials/credentials  \
-        --name="$(echo -n $PROW_JOB_ID|cut -d- -f-2)-mgmt"
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/hypershift-kubeconfig
-        name: hypershift-client-kubeconfig
-        namespace: test-credentials
-      from: bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-    test:
-    - as: create-management-cluster
-      cli: latest
-      commands: |-
-        CLUSTER_NAME="$(echo -n $PROW_JOB_ID|cut -d- -f-2)-mgmt"
-        export KUBECONFIG=/etc/hypershift-kubeconfig/kubeconfig
-        bin/hypershift create cluster aws \
-          --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
-          --aws-creds=/etc/hypershift-pool-aws-credentials/credentials \
-          --additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-          --name=${CLUSTER_NAME} \
-          --region=us-east-1 \
-          --base-domain=ci.hypershift.devcluster.openshift.com \
-          --instance-type=m5.xlarge \
-          --service-cidr=172.29.0.0/16 \
-          --node-pool-replicas=3
-        echo "Waiting for cluster to become available"
-        oc wait --timeout=10m --for=condition=Available --namespace=clusters hostedcluster/${CLUSTER_NAME}
-        echo "Cluster became available, creating kubeconfig"
-        bin/hypershift create kubeconfig --namespace=clusters --name=${CLUSTER_NAME} >${SHARED_DIR}/management_cluster_kubeconfig
-        echo "Waiting for clusteroperators to be ready"
-        export KUBECONFIG=${SHARED_DIR}/management_cluster_kubeconfig
-        until \
-          oc wait --all=true clusteroperator --for='condition=Available=True' >/dev/null && \
-          oc wait --all=true clusteroperator --for='condition=Progressing=False' >/dev/null && \
-          oc wait --all=true clusteroperator --for='condition=Degraded=False' >/dev/null;  do
-            echo "$(date --rfc-3339=seconds) Clusteroperators not yet ready"
-            sleep 1s
-        done
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      - mount_path: /etc/hypershift-kubeconfig
-        name: hypershift-client-kubeconfig
-        namespace: test-credentials
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 25m0s
-    - as: install-hypershift
-      cli: latest
-      commands: |-
-        unset KUBECONFIG
-        oc adm policy add-role-to-group system:image-puller system:authenticated --namespace "${NAMESPACE}"
-        oc adm policy add-role-to-group system:image-puller system:unauthenticated --namespace "${NAMESPACE}"
-        export KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
-        make ci-install-hypershift
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      resources:
-        requests:
-          cpu: 100m
-    - as: create-guest-cluster
-      cli: latest
-      commands: |-
-        export KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
-        bin/hypershift create cluster aws \
-          --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
-          --aws-creds=/etc/hypershift-pool-aws-credentials/credentials \
-          --additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-          --name="$(echo -n $PROW_JOB_ID|cut -d- -f-2)" \
-          --region=us-east-1 \
-          --base-domain=ci.hypershift.devcluster.openshift.com \
-          --release-image=${OPENSHIFT_410_CI_RELEASE_IMAGE} \
-          --instance-type=m5.xlarge \
-          --node-pool-replicas=3
-        echo "Waiting for cluster to become available"
-        oc wait --timeout=10m --for=condition=Available --namespace=clusters hostedcluster/$(echo -n $PROW_JOB_ID|cut -d- -f-2)
-        echo "Cluster became available, creating kubeconfig"
-        bin/hypershift create kubeconfig --namespace=clusters --name=$(echo -n $PROW_JOB_ID|cut -d- -f-2) >${SHARED_DIR}/nested_kubeconfig
-        echo "Waiting for clusteroperators to be ready"
-        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
-        until \
-          oc wait --all=true clusteroperator --for='condition=Available=True' >/dev/null && \
-          oc wait --all=true clusteroperator --for='condition=Progressing=False' >/dev/null && \
-          oc wait --all=true clusteroperator --for='condition=Degraded=False' >/dev/null;  do
-            echo "$(date --rfc-3339=seconds) Clusteroperators not yet ready"
-            sleep 1s
-        done
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OPENSHIFT_410_CI_RELEASE_IMAGE
-        name: release:latest
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 25m0s
-    - as: conformance-tests
-      commands: |-
-        export HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG=/etc/hypershift-kubeconfig/kubeconfig
-        export HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE="clusters-$(echo -n $PROW_JOB_ID|cut -d- -f-2)"
-        export AWS_SHARED_CREDENTIALS_FILE=/etc/hypershift-pool-aws-credentials/credentials
-        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
-        openshift-tests run openshift/conformance/serial \
-          -o "${ARTIFACT_DIR}/e2e.log" \
-          --junit-dir "${ARTIFACT_DIR}/junit"
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/hypershift-kubeconfig
-        name: hypershift-client-kubeconfig
-        namespace: test-credentials
-      from: openshift-tests
-      resources:
-        requests:
-          cpu: "3"
-          memory: 600Mi
-- as: e2e-kubevirt-all
-  optional: true
-  steps:
-    cluster_profile: azure4
-    test:
-    - as: deploy-cnv
-      cli: latest
-      commands: |-
-        oc apply -f - <<EOF
-        apiVersion: v1
-        kind: Namespace
-        metadata:
-          name: openshift-cnv
-        EOF
-
-        oc apply -f - <<EOF
-        apiVersion: operators.coreos.com/v1
-        kind: OperatorGroup
-        metadata:
-          name: openshift-cnv-group
-          namespace: openshift-cnv
-        spec:
-          targetNamespaces:
-          - openshift-cnv
-        EOF
-
-        cat <<EOF | oc apply -f -
-        apiVersion: operators.coreos.com/v1alpha1
-        kind: Subscription
-        metadata:
-          labels:
-            operators.coreos.com/kubevirt-hyperconverged.openshift-cnv: ''
-          name: kubevirt-hyperconverged
-          namespace: openshift-cnv
-        spec:
-          channel: stable
-          installPlanApproval: Automatic
-          name: kubevirt-hyperconverged
-          source: redhat-operators
-          sourceNamespace: openshift-marketplace
-        EOF
-
-        sleep 60
-
-        RETRIES=30
-        CSV=
-        for i in $(seq ${RETRIES}); do
-          if [[ -z ${CSV} ]]; then
-            CSV=$(oc get subscription -n openshift-cnv kubevirt-hyperconverged -o jsonpath='{.status.installedCSV}')
-          fi
-
-          if [[ -z ${CSV} ]]; then
-            echo "Try ${i}/${RETRIES}: can't get the CSV yet. Checking again in 30 seconds"
-            sleep 30
-          fi
-
-          if [[ $(oc get csv -n openshift-cnv ${CSV} -o jsonpath={.status.phase}) == "Succeeded" ]]; then
-            echo "CNV is deployed"
-            break
-          else
-            echo "Try ${i}/${RETRIES}: CNV is not deployed yet. Checking again in 30 seconds"
-            sleep 30
-          fi
-        done
-
-        if [[ $(oc get csv -n openshift-cnv ${CSV} -o jsonpath={.status.phase}) != "Succeeded" ]]; then
-          echo "Error: Failed to deploy CNV"
-          echo "CSV ${CSV} YAML"
-          oc get CSV ${CSV} -n openshift-cnv -o yaml
-          echo
-          echo "CSV ${CSV} Describe"
-          oc describe CSV ${CSV} -n openshift-cnv
-          exit 1
-        fi
-
-        oc create -f - <<EOF
-        apiVersion: hco.kubevirt.io/v1beta1
-        kind: HyperConverged
-        metadata:
-          name: kubevirt-hyperconverged
-          namespace: openshift-cnv
-        EOF
-
-        oc wait hyperconverged -n openshift-cnv kubevirt-hyperconverged --for=condition=Available --timeout=15m
-      from: bin
-      resources:
-        requests:
-          cpu: 500m
-          memory: 1Gi
-    - as: install-hypershift
-      cli: latest
-      commands: bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
-      credentials:
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      resources:
-        requests:
-          cpu: 100m
-    workflow: ipi-azure
 zz_generated_metadata:
   branch: release-4.10
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11.yaml
index 2eef3de873e06..39e571a84711d 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -96,171 +92,13 @@ tests:
     from: src
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
 - as: e2e-aws
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
-    test:
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift-private
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: make ci-test-e2e
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      from: test-bin
-      grace_period: 30m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 1h0m0s
-    workflow: generic-claim
-- as: e2e-aws-all
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
-  optional: true
-  steps:
-    test:
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: make ci-test-e2e
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      from: test-bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 2h0m0s
-    workflow: generic-claim
+    workflow: hypershift-aws-e2e-nested
 - as: e2e-aws-metrics
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
   optional: true
   steps:
-    test:
-    - as: setup-monitoring
-      commands: |-
-        bin/test-setup monitoring \
-          --remote-write-url=$(cat /etc/grafana-prom-push/url) \
-          --remote-write-username-file=/etc/grafana-prom-push/username \
-          --remote-write-password-file=/etc/grafana-prom-push/password
-      credentials:
-      - mount_path: /etc/grafana-prom-push
-        name: hypershift-sjenning-homelab-push
-        namespace: test-credentials
-      from: test-bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 2m0s
-    - as: install-hypershift
-      cli: latest
-      commands: make ci-install-hypershift
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: HYPERSHIFT_RELEASE_LATEST
-        name: hypershift-operator
-      from: bin
-      grace_period: 1m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 5m0s
-    - as: test-e2e
-      cli: latest
-      commands: make ci-test-e2e
-      credentials:
-      - mount_path: /etc/hypershift-pool-aws-credentials
-        name: hypershift-pool-aws-credentials
-        namespace: test-credentials
-      - mount_path: /etc/ci-pull-credentials
-        name: ci-pull-credentials
-        namespace: test-credentials
-      dependencies:
-      - env: OCP_IMAGE_LATEST
-        name: release:latest
-      - env: OCP_IMAGE_PREVIOUS
-        name: release:hosted-ocp-previous
-      from: test-bin
-      grace_period: 15m0s
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 1h0m0s
-    workflow: generic-claim
+    workflow: hypershift-aws-e2e-metrics
 - as: e2e-conformance
   optional: true
   steps:
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12.yaml
index 9b82295d96fc5..44ea11050d981 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -71,12 +67,16 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true
       name: 4.12-priv
       namespace: ocp-private
+  previous:
+    release:
+      channel: stable
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -96,15 +96,11 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+- as: e2e-aws
+  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+  steps:
+    workflow: hypershift-aws-e2e-nested
 - as: e2e-aws-metrics
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
   optional: true
   steps:
     workflow: hypershift-aws-e2e-metrics
@@ -134,6 +130,8 @@ tests:
   optional: true
   steps:
     cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     test:
     - as: deploy-cnv
       cli: latest
@@ -149,7 +147,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -184,6 +182,10 @@ tests:
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: gcp
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
+    env:
+      COMPUTE_NODE_TYPE: n2-standard-4
     test:
     - as: deploy-cnv
       cli: latest
@@ -199,7 +201,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -229,10 +231,6 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp-ovn
-- as: e2e-aws-nested
-  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
-  steps:
-    workflow: hypershift-aws-e2e-nested
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13.yaml
index d2ee60fa12745..e35df06c0d15a 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -70,12 +66,16 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true
       name: 4.13-priv
       namespace: ocp-private
+  previous:
+    release:
+      channel: stable
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -95,15 +95,11 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+- as: e2e-aws
+  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+  steps:
+    workflow: hypershift-aws-e2e-nested
 - as: e2e-aws-metrics
-  cluster_claim:
-    architecture: amd64
-    as: not_latest
-    cloud: aws
-    owner: hypershift
-    product: ocp
-    timeout: 1h30m0s
-    version: "4.9"
   optional: true
   steps:
     workflow: hypershift-aws-e2e-metrics
@@ -133,6 +129,8 @@ tests:
   optional: true
   steps:
     cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     test:
     - as: deploy-cnv
       cli: latest
@@ -148,7 +146,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -183,6 +181,10 @@ tests:
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: gcp
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
+    env:
+      COMPUTE_NODE_TYPE: n2-standard-4
     test:
     - as: deploy-cnv
       cli: latest
@@ -198,7 +200,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -228,10 +230,6 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp-ovn
-- as: e2e-aws-nested
-  skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
-  steps:
-    workflow: hypershift-aws-e2e-nested
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-master.yaml b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-master.yaml
index f2999d203e2ef..34bc4f445a5dc 100644
--- a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ib-sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.11.yaml b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.11.yaml
index f5f935ae50e83..56008837f59a8 100644
--- a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.11.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.11-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ib-sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-infiniband-cni
 promotion:
   name: 4.11-priv
diff --git a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.12.yaml b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.12.yaml
index 2025ac7db70b5..7c6d01c51f8dc 100644
--- a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ib-sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.13.yaml b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.13.yaml
index 33da3c448e6ad..36bc4f3584985 100644
--- a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ib-sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-master.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-master.yaml
index 7a90f50bc7dac..6a74ec2ab0fa0 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-master.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ibm-vpc-block-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10.yaml
index 679db065d40e3..c4017d5b747c2 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10.yaml
@@ -19,6 +19,9 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
   to: ibm-vpc-block-csi-driver-operator
+- dockerfile_path: Dockerfile.test
+  from: src
+  to: ibm-vpc-block-csi-driver-operator-test
 promotion:
   name: 4.10-priv
   namespace: ocp-private
@@ -48,6 +51,14 @@ tests:
   commands: make verify
   container:
     from: src
+- as: e2e-ibmcloud-csi
+  optional: true
+  steps:
+    cluster_profile: ibmcloud
+    env:
+      TEST_SKIPS: Verify if offline PVC expansion works\| topology should provision
+        a volume and schedule a pod with AllowedTopologies
+    workflow: openshift-e2e-ibmcloud-csi
 zz_generated_metadata:
   branch: release-4.10
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
index 552ee5705eecd..b19a7803b8d24 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ibm-vpc-block-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
index a14017e0f13d9..84ced214e1629 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/ibm-vpc-block-csi-driver-operator
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10.yaml
index ff9d2c9505c5c..2a85fe58f5eb7 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10.yaml
@@ -51,6 +51,14 @@ tests:
     make verify
   container:
     from: src
+- as: e2e-ibmcloud-csi
+  optional: true
+  steps:
+    cluster_profile: ibmcloud
+    env:
+      TEST_SKIPS: Verify if offline PVC expansion works\| topology should provision
+        a volume and schedule a pod with AllowedTopologies
+    workflow: openshift-e2e-ibmcloud-csi
 zz_generated_metadata:
   branch: release-4.10
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11.yaml b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11.yaml
index 5804d0a70c2da..2f0bbde76b4ad 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11.yaml
@@ -51,6 +51,11 @@ tests:
     make verify
   container:
     from: src
+- as: e2e-ibmcloud-csi
+  optional: true
+  steps:
+    cluster_profile: ibmcloud
+    workflow: openshift-e2e-ibmcloud-csi
 zz_generated_metadata:
   branch: release-4.11
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10.yaml b/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10.yaml
index f3667f401a083..0ff0daac8098a 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10.yaml
@@ -9,10 +9,7 @@ base_images:
     tag: rhel-8-golang-1.17-openshift-4.10
 binary_build_commands: make build
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.17
+  from_repository: true
 canonical_go_repository: github.com/openshift/ibm-vpc-node-label-updater
 images:
 - dockerfile_path: Dockerfile.openshift
@@ -48,6 +45,14 @@ tests:
   commands: go test -v -race ./pkg/...
   container:
     from: src
+- as: e2e-ibmcloud-csi
+  optional: true
+  steps:
+    cluster_profile: ibmcloud
+    env:
+      TEST_SKIPS: Verify if offline PVC expansion works\| topology should provision
+        a volume and schedule a pod with AllowedTopologies
+    workflow: openshift-e2e-ibmcloud-csi
 zz_generated_metadata:
   branch: release-4.10
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11.yaml b/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11.yaml
index 485f91ef1c7e0..703201096e107 100644
--- a/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11.yaml
@@ -9,10 +9,7 @@ base_images:
     tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.17
+  from_repository: true
 canonical_go_repository: github.com/openshift/ibm-vpc-node-label-updater
 images:
 - dockerfile_path: Dockerfile.openshift
@@ -48,6 +45,11 @@ tests:
   commands: go test -v -race ./pkg/...
   container:
     from: src
+- as: e2e-ibmcloud-csi
+  optional: true
+  steps:
+    cluster_profile: ibmcloud
+    workflow: openshift-e2e-ibmcloud-csi
 zz_generated_metadata:
   branch: release-4.11
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main.yaml b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main.yaml
index 569588fff6cc1..a71da700a8e98 100644
--- a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main.yaml
+++ b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main.yaml
@@ -51,10 +51,13 @@ tests:
   commands: make lint
   container:
     from: src
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.11.yaml b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.11.yaml
index afa78030f770e..8e2a817034c45 100644
--- a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.11.yaml
@@ -7,19 +7,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/image-customization-controller
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: machine-image-customization-controller
 promotion:
   name: 4.11-priv
diff --git a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12.yaml b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12.yaml
index fa7fe63b85214..c1ea7bfea271c 100644
--- a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12.yaml
@@ -52,10 +52,13 @@ tests:
   commands: make lint
   container:
     from: src
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13.yaml b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13.yaml
index eeb73a341a62c..8e0891bdf3043 100644
--- a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13.yaml
@@ -51,10 +51,13 @@ tests:
   commands: make lint
   container:
     from: src
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-master.yaml b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-master.yaml
index d9b838b3ba92e..fd2a3868b0145 100644
--- a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-master.yaml
+++ b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-master.yaml
@@ -43,7 +43,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12.yaml b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12.yaml
index 5125bf1765042..1977b1c9307a6 100644
--- a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12.yaml
@@ -44,7 +44,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13.yaml b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13.yaml
index d3cef2d17d49a..055aa44e9cc2f 100644
--- a/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13.yaml
@@ -43,7 +43,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master.yaml b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master.yaml
index 81c29d8ce96a8..2f79f229eb867 100644
--- a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master.yaml
+++ b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
+  dev-scripts:
+    name: test
+    namespace: ocp-kni
+    tag: dev-scripts
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,9 +32,27 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ingress-node-firewall-daemon
+operator:
+  bundles:
+  - dockerfile_path: bundle.Dockerfile
+  substitutions:
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.12
+    with: pipeline:ingress-node-firewall
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall-daemon:4.12
+    with: pipeline:ingress-node-firewall
 promotion:
   name: 4.12-priv
   namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
 resources:
   '*':
     limits:
@@ -38,15 +60,30 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-tag_specification:
-  name: 4.12-priv
-  namespace: ocp-private
 tests:
 - as: test-fmt
   commands: |
     make fmt
   container:
     from: src
+- as: unit-test
+  commands: |
+    make test
+  container:
+    from: src
+- as: lint
+  commands: |
+    make lint
+  container:
+    from: src
+- as: ingress-node-firewall-e2e-metal-ipi
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      DEVSCRIPTS_CONFIG: |
+        IP_STACK=v4v6
+        NETWORK_TYPE=OVNKubernetes
+    workflow: baremetalds-ingress-node-firewall-e2e
 zz_generated_metadata:
   branch: master
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12.yaml b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12.yaml
index 3309a9fb38cf6..2cc14a8bffb39 100644
--- a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
+  dev-scripts:
+    name: test
+    namespace: ocp-kni
+    tag: dev-scripts
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,10 +32,28 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ingress-node-firewall-daemon
+operator:
+  bundles:
+  - dockerfile_path: bundle.Dockerfile
+  substitutions:
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.12
+    with: pipeline:ingress-node-firewall
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall-daemon:4.12
+    with: pipeline:ingress-node-firewall
 promotion:
   disabled: true
   name: 4.12-priv
   namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
 resources:
   '*':
     limits:
@@ -39,15 +61,30 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-tag_specification:
-  name: 4.12-priv
-  namespace: ocp-private
 tests:
 - as: test-fmt
   commands: |
     make fmt
   container:
     from: src
+- as: unit-test
+  commands: |
+    make test
+  container:
+    from: src
+- as: lint
+  commands: |
+    make lint
+  container:
+    from: src
+- as: ingress-node-firewall-e2e-metal-ipi
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      DEVSCRIPTS_CONFIG: |
+        IP_STACK=v4v6
+        NETWORK_TYPE=OVNKubernetes
+    workflow: baremetalds-ingress-node-firewall-e2e
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13.yaml b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13.yaml
index a591f194cb6ab..d65aa4a7a36bc 100644
--- a/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
+  dev-scripts:
+    name: test
+    namespace: ocp-kni
+    tag: dev-scripts
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,9 +32,27 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ingress-node-firewall-daemon
+operator:
+  bundles:
+  - dockerfile_path: bundle.Dockerfile
+  substitutions:
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.12
+    with: pipeline:ingress-node-firewall
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall-daemon:4.12
+    with: pipeline:ingress-node-firewall
 promotion:
   name: 4.13-priv
   namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.13-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.13-priv
+      namespace: ocp-private
 resources:
   '*':
     limits:
@@ -38,15 +60,30 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-tag_specification:
-  name: 4.13-priv
-  namespace: ocp-private
 tests:
 - as: test-fmt
   commands: |
     make fmt
   container:
     from: src
+- as: unit-test
+  commands: |
+    make test
+  container:
+    from: src
+- as: lint
+  commands: |
+    make lint
+  container:
+    from: src
+- as: ingress-node-firewall-e2e-metal-ipi
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      DEVSCRIPTS_CONFIG: |
+        IP_STACK=v4v6
+        NETWORK_TYPE=OVNKubernetes
+    workflow: baremetalds-ingress-node-firewall-e2e
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
index 33b875df68fe9..97a02f29bad97 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -480,12 +476,16 @@ tests:
   run_if_changed: (azure|azurestack)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack
 - as: e2e-azurestack-upi
   optional: true
   run_if_changed: ^(upi/(azure|azurestack)/.*)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack-upi
 - as: e2e-ibmcloud
   optional: true
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.10.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.10.yaml
index e294935efbbca..e531411c6fc4e 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -447,11 +443,15 @@ tests:
   optional: true
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack
 - as: e2e-azurestack-upi
   optional: true
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack-upi
 - as: e2e-ibmcloud
   optional: true
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.11.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.11.yaml
index 994d895f51349..50b01084e5f61 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -488,12 +484,16 @@ tests:
   run_if_changed: (azure|azurestack)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack
 - as: e2e-azurestack-upi
   optional: true
   run_if_changed: ^(upi/(azure|azurestack)/.*)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack-upi
 - as: e2e-ibmcloud
   optional: true
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml
index 4ce5595897a7d..98ef18fb4fc64 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -481,12 +477,16 @@ tests:
   run_if_changed: (azure|azurestack)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack
 - as: e2e-azurestack-upi
   optional: true
   run_if_changed: ^(upi/(azure|azurestack)/.*)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack-upi
 - as: e2e-ibmcloud
   optional: true
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml
index 6941eed1b04ef..4cde1c084b6c7 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -480,12 +476,16 @@ tests:
   run_if_changed: (azure|azurestack)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack
 - as: e2e-azurestack-upi
   optional: true
   run_if_changed: ^(upi/(azure|azurestack)/.*)
   steps:
     cluster_profile: azurestack
+    env:
+      TEST_SKIPS: provisioning should provision storage with pvc data source in parallel
     workflow: openshift-e2e-azurestack-upi
 - as: e2e-ibmcloud
   optional: true
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml
index 9346808be225f..af56944a7a666 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.8.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.8.yaml
index 16b2aada58d4e..e016e078d46bd 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.9.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.9.yaml
index fd1f54ca98237..07ad4834e320c 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main.yaml b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main.yaml
index 36a7f8b18a662..e32d4cc1700b8 100644
--- a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main.yaml
+++ b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main.yaml
@@ -40,10 +40,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12.yaml b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12.yaml
index 1863c176d722b..523910dfc0640 100644
--- a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12.yaml
@@ -41,10 +41,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13.yaml b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13.yaml
index 1c9f895e1d45d..caf9ee3520b46 100644
--- a/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13.yaml
@@ -40,10 +40,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-master.yaml b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-master.yaml
index 658707e725c03..bf546b5e492d5 100644
--- a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-master.yaml
+++ b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-master.yaml
@@ -44,10 +44,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-virtualmedia
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12.yaml b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12.yaml
index 574d266792b1c..016928163ece7 100644
--- a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12.yaml
@@ -45,10 +45,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-virtualmedia
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13.yaml b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13.yaml
index f3ca235fc55d3..182ce276dd022 100644
--- a/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13.yaml
@@ -44,10 +44,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-virtualmedia
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master.yaml b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master.yaml
index 5a9b9a8722deb..bda4da79251f1 100644
--- a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master.yaml
+++ b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master.yaml
@@ -37,10 +37,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 zz_generated_metadata:
   branch: master
diff --git a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12.yaml b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12.yaml
index d380c1ff079f1..168e1a25704c0 100644
--- a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12.yaml
@@ -38,10 +38,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 zz_generated_metadata:
   branch: release-4.12
diff --git a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13.yaml b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13.yaml
index 724b2ed6f865c..7621cf63efedf 100644
--- a/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13.yaml
@@ -37,10 +37,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 zz_generated_metadata:
   branch: release-4.13
diff --git a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master.yaml b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master.yaml
index 20b567bdd2c59..1c4764077da11 100644
--- a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master.yaml
+++ b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master.yaml
@@ -33,10 +33,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
diff --git a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12.yaml b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12.yaml
index 255cd4042d063..6bd25fa1d0c21 100644
--- a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12.yaml
@@ -34,10 +34,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
diff --git a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13.yaml b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13.yaml
index fe5ba00e515bb..b0b6a58208640 100644
--- a/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13.yaml
@@ -33,10 +33,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
diff --git a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master.yaml b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master.yaml
index de286ed8e1514..1835919e8980c 100644
--- a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master.yaml
+++ b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master.yaml
@@ -46,7 +46,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12.yaml b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12.yaml
index 1fe2eb7ee7035..87559b9d70229 100644
--- a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12.yaml
@@ -47,7 +47,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13.yaml b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13.yaml
index f3255893debac..b52f321bb8e89 100644
--- a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13.yaml
@@ -46,7 +46,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master.yaml b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master.yaml
index 14228d7444796..78667d905f35c 100644
--- a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master.yaml
+++ b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master.yaml
@@ -45,7 +45,7 @@ tests:
   commands: make test-unit
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12.yaml b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12.yaml
index 8cd8342c7fbd5..be638cfe566e1 100644
--- a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12.yaml
@@ -46,7 +46,7 @@ tests:
   commands: make test-unit
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13.yaml b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13.yaml
index 91134768c8b93..01a77bf5309e3 100644
--- a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13.yaml
@@ -45,7 +45,7 @@ tests:
   commands: make test-unit
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master.yaml b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master.yaml
index 51d8438896339..3e8adf08f3993 100644
--- a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: 4.12-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.12_base:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -29,27 +21,21 @@ canonical_go_repository: github.com/openshift/kubernetes-nmstate
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
@@ -100,6 +86,10 @@ tests:
   commands: make test/unit
   container:
     from: src
+- as: check-generate-bundle
+  commands: VERSION= make check-ocp-bundle
+  container:
+    from: src
 - as: e2e-handler-sdn-ipv4
   steps:
     cluster_profile: equinix-ocp-metal
diff --git a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12.yaml b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12.yaml
index 2970821479fe5..68cd35fa15803 100644
--- a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: 4.12-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.12_base:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -29,27 +21,21 @@ canonical_go_repository: github.com/openshift/kubernetes-nmstate
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
@@ -101,6 +87,10 @@ tests:
   commands: make test/unit
   container:
     from: src
+- as: check-generate-bundle
+  commands: VERSION= make check-ocp-bundle
+  container:
+    from: src
 - as: e2e-handler-sdn-ipv4
   steps:
     cluster_profile: equinix-ocp-metal
diff --git a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13.yaml b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13.yaml
index 71189e5401063..c9a74fd0eca93 100644
--- a/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: 4.13-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.12_base:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -29,27 +21,21 @@ canonical_go_repository: github.com/openshift/kubernetes-nmstate
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
@@ -100,6 +86,10 @@ tests:
   commands: make test/unit
   container:
     from: src
+- as: check-generate-bundle
+  commands: VERSION= make check-ocp-bundle
+  container:
+    from: src
 - as: e2e-handler-sdn-ipv4
   steps:
     cluster_profile: equinix-ocp-metal
diff --git a/ci-operator/config/openshift-priv/local-storage-operator/openshift-priv-local-storage-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/local-storage-operator/openshift-priv-local-storage-operator-release-4.8.yaml
index 5c0f14cacbcbb..5cbaaf1e3d182 100644
--- a/ci-operator/config/openshift-priv/local-storage-operator/openshift-priv-local-storage-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/local-storage-operator/openshift-priv-local-storage-operator-release-4.8.yaml
@@ -7,10 +7,10 @@ base_images:
     name: 4.8-priv
     namespace: ocp-private
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.15-openshift-4.8:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_4.8_must-gather:
+    name: 4.8-priv
+    namespace: ocp-private
+    tag: must-gather
   ocp_builder_rhel-8-golang-1.16-openshift-4.8:
     name: builder
     namespace: ocp
@@ -39,9 +39,9 @@ images:
 - dockerfile_path: Dockerfile.mustgather
   from: must_gather
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_4.8_must-gather:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/4.8:must-gather
   to: local-storage-mustgather
 promotion:
   name: 4.8-priv
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master.yaml
index a35233f3fe8e9..7e4400fcf825e 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master.yaml
@@ -62,12 +62,12 @@ tests:
   commands: IS_CONTAINER=TRUE make verify-crds-sync
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -119,7 +119,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-azure
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -139,7 +139,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12.yaml
index 9f2caa5f814cd..86fe22bd51883 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12.yaml
@@ -63,12 +63,12 @@ tests:
   commands: IS_CONTAINER=TRUE make verify-crds-sync
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -120,7 +120,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-azure
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -140,7 +140,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13.yaml
index 932f240d71812..999b40e78a16b 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13.yaml
@@ -62,12 +62,12 @@ tests:
   commands: IS_CONTAINER=TRUE make verify-crds-sync
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -119,7 +119,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-azure
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -139,7 +139,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
index e51b94ba5bf6d..e71f098e1fa72 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
@@ -62,6 +62,8 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
+    env:
+      SPOT_INSTANCES: "true"
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.12.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.12.yaml
index 11e19e88c1172..492aed85f14b2 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.12.yaml
@@ -63,6 +63,8 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
+    env:
+      SPOT_INSTANCES: "true"
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.13.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.13.yaml
index c851847a55a25..ecdf5a17f98ce 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.13.yaml
@@ -62,6 +62,8 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
+    env:
+      SPOT_INSTANCES: "true"
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-master.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-master.yaml
index 2d08dd9a46429..b88b13840d595 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml
index 2308db9c9c4d0..f6e503f71219a 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml
index 623ac5ed57dff..e80eed89bbd28 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml
index bec3b487bd519..6dc7ca3e8a062 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml
index 59866fe0a3455..38c3191fe231e 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.7.yaml
index ae0a3d9c0b24c..a6cb9e34d77bd 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.8.yaml
index 791189fd99915..47cc4c91d117e 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.9.yaml
index 9ffff86410f35..5159b63ecf3b1 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml
index 91778a72e1ed8..8f30289380055 100644
--- a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: 4.12-priv
     namespace: ocp-private
     tag: installer
@@ -21,9 +21,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.12.yaml b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.12.yaml
index 4af6f10f45233..f12fb0449ec96 100644
--- a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.12.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: 4.12-priv
     namespace: ocp-private
     tag: installer
@@ -21,9 +21,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.13.yaml b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.13.yaml
index 807827fc6ba1d..5db9ea6e27132 100644
--- a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.13.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: 4.13-priv
     namespace: ocp-private
     tag: installer
@@ -21,9 +21,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-master.yaml b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-master.yaml
index df53f8f33a42a..2114f01cc8fd0 100644
--- a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-master.yaml
+++ b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-master.yaml
@@ -48,7 +48,7 @@ resources:
       memory: 200Mi
 test_binary_build_commands: '"make build GO_BUILD_FLAGS:=''-race'' --warn-undefined-variables"'
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12.yaml b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12.yaml
index 8bb5549bc9a4b..b5fcd54250538 100644
--- a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12.yaml
@@ -49,7 +49,7 @@ resources:
       memory: 200Mi
 test_binary_build_commands: '"make build GO_BUILD_FLAGS:=''-race'' --warn-undefined-variables"'
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13.yaml b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13.yaml
index 3d208571c82ce..22182a3c29ac2 100644
--- a/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13.yaml
@@ -48,7 +48,7 @@ resources:
       memory: 200Mi
 test_binary_build_commands: '"make build GO_BUILD_FLAGS:=''-race'' --warn-undefined-variables"'
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml
index 8600fa10cd59e..df2ce111f3d72 100644
--- a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml
+++ b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml
@@ -11,10 +11,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: 4.12-priv
     namespace: ocp-private
@@ -27,9 +27,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -37,16 +37,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -55,9 +55,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
@@ -130,7 +130,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.12.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.12.yaml
index 32a906d165f00..fe939e42ca8b7 100644
--- a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.12.yaml
@@ -11,10 +11,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: 4.12-priv
     namespace: ocp-private
@@ -27,9 +27,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -37,16 +37,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -55,9 +55,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
@@ -131,7 +131,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.13.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.13.yaml
index 970b0256ff2b6..0cb00fc27b7df 100644
--- a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.13.yaml
@@ -11,10 +11,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: 4.13-priv
     namespace: ocp-private
@@ -27,9 +27,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -37,16 +37,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -55,9 +55,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
@@ -130,7 +130,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml
index 3fbdeb1ee8037..9cc1468bbd3a8 100644
--- a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml
+++ b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml
@@ -51,7 +51,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml
index bda746c964012..3c05cefb3ba3c 100644
--- a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml
@@ -52,7 +52,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml
index 3aafd8d38e941..2861056e7cb1f 100644
--- a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml
@@ -51,7 +51,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master.yaml b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master.yaml
index a5d7c24ff72dd..f22f30a36fef9 100644
--- a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master.yaml
+++ b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make doccheck
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12.yaml b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12.yaml
index 45cdc0a41074b..617ba90669abf 100644
--- a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12.yaml
@@ -54,7 +54,7 @@ tests:
   commands: make doccheck
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13.yaml b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13.yaml
index 2b9af98ae8b60..ad5fb8fdd7d4a 100644
--- a/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make doccheck
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml
index b87513952f4a8..501cedc97e5eb 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml
@@ -30,6 +30,15 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: tests-private
+- dockerfile_literal: |
+    FROM src
+    RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: src
+  to: tests-private-ui
 - dockerfile_literal: |
     FROM src
     RUN unset GOFLAGS && \
@@ -51,6 +60,7 @@ images:
 promotion:
   excluded_images:
   - tests-private
+  - tests-private-ui
   - tests-private-pr
   - tests-private-cck
   name: 4.12-priv
@@ -105,9 +115,9 @@ tests:
 
         export MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
         curl -s -L https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x86_64.tar.gz -o glx.tar.gz && tar -C ${HOME} -xvf glx.tar.gz govc && rm -f glx.tar.gz
-        curl -s -k ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
+        curl -s -k -L ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
 
         oc image extract quay.io/openshifttest/hypershift-client:latest --file=/hypershift && mv hypershift "${HOME}" && chmod 755 "${HOME}"/hypershift
         oc image extract quay.io/openshifttest/openshift4-tools:v1 --file=/tmp/OpenShift4-tools.tar && tar -C "${HOME}" -xf OpenShift4-tools.tar && rm -fr OpenShift4-tools.tar
@@ -136,12 +146,12 @@ tests:
     - as: console-test
       cli: latest
       commands: cd frontend;./console-test-frontend.sh
-      from: tests-private
+      from: tests-private-ui
       resources:
         requests:
           cpu: "2"
           memory: 4Gi
-      timeout: 1h0m0s
+      timeout: 2h0m0s
     workflow: ipi-gcp
 - as: debug-disasterrecovery-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.10.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.10.yaml
index 469099d6df4ea..bc06620d0d518 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.10.yaml
@@ -26,9 +26,19 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
   to: tests-private
+- dockerfile_literal: |
+    FROM src
+    RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: src
+  to: tests-private-ui
 promotion:
   excluded_images:
   - tests-private
+  - tests-private-ui
   name: 4.10-priv
   namespace: ocp-private
 releases:
@@ -96,12 +106,12 @@ tests:
     - as: console-test
       cli: latest
       commands: cd frontend;./console-test-frontend.sh
-      from: tests-private
+      from: tests-private-ui
       resources:
         requests:
           cpu: "2"
           memory: 4Gi
-      timeout: 1h0m0s
+      timeout: 2h0m0s
     workflow: ipi-gcp
 - as: debug-disasterrecovery-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.11.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.11.yaml
index 4c6a2b2219070..d30bf4bf16af9 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.11.yaml
@@ -30,6 +30,15 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: tests-private
+- dockerfile_literal: |
+    FROM src
+    RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: src
+  to: tests-private-ui
 - dockerfile_literal: |
     FROM src
     RUN unset GOFLAGS && \
@@ -51,6 +60,7 @@ images:
 promotion:
   excluded_images:
   - tests-private
+  - tests-private-ui
   - tests-private-pr
   - tests-private-cck
   name: 4.11-priv
@@ -105,9 +115,9 @@ tests:
 
         export MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
         curl -s -L https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x86_64.tar.gz -o glx.tar.gz && tar -C ${HOME} -xvf glx.tar.gz govc && rm -f glx.tar.gz
-        curl -s -k ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.11/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
+        curl -s -k -L ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.11/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
 
         oc image extract quay.io/openshifttest/hypershift-client:latest --file=/hypershift && mv hypershift "${HOME}" && chmod 755 "${HOME}"/hypershift
         oc image extract quay.io/openshifttest/openshift4-tools:v1 --file=/tmp/OpenShift4-tools.tar && tar -C "${HOME}" -xf OpenShift4-tools.tar && rm -fr OpenShift4-tools.tar
@@ -136,12 +146,12 @@ tests:
     - as: console-test
       cli: latest
       commands: cd frontend;./console-test-frontend.sh
-      from: tests-private
+      from: tests-private-ui
       resources:
         requests:
           cpu: "2"
           memory: 4Gi
-      timeout: 1h0m0s
+      timeout: 2h0m0s
     workflow: ipi-gcp
 - as: debug-disasterrecovery-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.12.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.12.yaml
index 19c6e6a21f479..3077735079d01 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.12.yaml
@@ -30,6 +30,15 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: tests-private
+- dockerfile_literal: |
+    FROM src
+    RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: src
+  to: tests-private-ui
 - dockerfile_literal: |
     FROM src
     RUN unset GOFLAGS && \
@@ -52,6 +61,7 @@ promotion:
   disabled: true
   excluded_images:
   - tests-private
+  - tests-private-ui
   - tests-private-pr
   - tests-private-cck
   name: 4.12-priv
@@ -106,9 +116,9 @@ tests:
 
         export MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
         curl -s -L https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x86_64.tar.gz -o glx.tar.gz && tar -C ${HOME} -xvf glx.tar.gz govc && rm -f glx.tar.gz
-        curl -s -k ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
+        curl -s -k -L ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
 
         oc image extract quay.io/openshifttest/hypershift-client:latest --file=/hypershift && mv hypershift "${HOME}" && chmod 755 "${HOME}"/hypershift
         oc image extract quay.io/openshifttest/openshift4-tools:v1 --file=/tmp/OpenShift4-tools.tar && tar -C "${HOME}" -xf OpenShift4-tools.tar && rm -fr OpenShift4-tools.tar
@@ -137,12 +147,12 @@ tests:
     - as: console-test
       cli: latest
       commands: cd frontend;./console-test-frontend.sh
-      from: tests-private
+      from: tests-private-ui
       resources:
         requests:
           cpu: "2"
           memory: 4Gi
-      timeout: 1h0m0s
+      timeout: 2h0m0s
     workflow: ipi-gcp
 - as: debug-disasterrecovery-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.13.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.13.yaml
index 589a975531ea6..f82222ca33c1d 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.13.yaml
@@ -30,6 +30,15 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: tests-private
+- dockerfile_literal: |
+    FROM src
+    RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: src
+  to: tests-private-ui
 - dockerfile_literal: |
     FROM src
     RUN unset GOFLAGS && \
@@ -51,6 +60,7 @@ images:
 promotion:
   excluded_images:
   - tests-private
+  - tests-private-ui
   - tests-private-pr
   - tests-private-cck
   name: 4.13-priv
@@ -105,9 +115,9 @@ tests:
 
         export MIRROR2URL="https://mirror2.openshift.com/pub/openshift-v4"
         curl -s -L https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x86_64.tar.gz -o glx.tar.gz && tar -C ${HOME} -xvf glx.tar.gz govc && rm -f glx.tar.gz
-        curl -s -k ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
-        curl -s -k ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
+        curl -s -k -L ${MIRROR2URL}/clients/ocp-dev-preview/latest-4.12/opm-linux.tar.gz -o opm.tar.gz && tar -C ${HOME} -xzvf opm.tar.gz && rm -fr opm.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/ocp-dev-preview/latest/oc-mirror.tar.gz -o om.tar.gz && tar -C ${HOME} -xzvf om.tar.gz && chmod +x ${HOME}/oc-mirror && rm -f om.tar.gz
+        curl -s -k -L ${MIRROR2URL}/x86_64/clients/operator-sdk/pre-release/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && tar -C ${HOME} -xzvf opt-sdk.tar.gz && rm -fr opt-sdk.tar.gz
 
         oc image extract quay.io/openshifttest/hypershift-client:latest --file=/hypershift && mv hypershift "${HOME}" && chmod 755 "${HOME}"/hypershift
         oc image extract quay.io/openshifttest/openshift4-tools:v1 --file=/tmp/OpenShift4-tools.tar && tar -C "${HOME}" -xf OpenShift4-tools.tar && rm -fr OpenShift4-tools.tar
@@ -136,12 +146,12 @@ tests:
     - as: console-test
       cli: latest
       commands: cd frontend;./console-test-frontend.sh
-      from: tests-private
+      from: tests-private-ui
       resources:
         requests:
           cpu: "2"
           memory: 4Gi
-      timeout: 1h0m0s
+      timeout: 2h0m0s
     workflow: ipi-gcp
 - as: debug-disasterrecovery-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master.yaml b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master.yaml
index eb4b1cf282145..f48ef1d44885c 100644
--- a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make verify
   container:
     from: ci-image
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12.yaml b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12.yaml
index d0b557aea686f..9c561b6fb4d32 100644
--- a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12.yaml
@@ -54,7 +54,7 @@ tests:
   commands: make verify
   container:
     from: ci-image
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13.yaml b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13.yaml
index 4de0f5b75b135..2e8738e862d37 100644
--- a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make verify
   container:
     from: ci-image
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml
index d645034a3e456..166bd5ce643d0 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml
@@ -58,10 +58,6 @@ releases:
       include_built_images: true
       name: 4.12-priv
       namespace: ocp-private
-  previous:
-    integration:
-      name: 4.11-priv
-      namespace: ocp-private
 resources:
   '*':
     requests:
@@ -97,7 +93,7 @@ tests:
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-loki
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-e2e-gcp-loki
@@ -124,7 +120,7 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-cmd
+- as: e2e-agnostic-ovn-cmd
   optional: true
   steps:
     cluster_profile: azure4
@@ -178,7 +174,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/image-registry
     workflow: openshift-e2e-aws-image-registry
-- as: e2e-gcp-upgrade
+- as: e2e-gcp-ovn-upgrade
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-upgrade-gcp
@@ -186,8 +182,6 @@ tests:
   optional: true
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     workflow: openshift-upgrade-gcp-ovn-rt
 - as: e2e-gcp-csi
   optional: true
@@ -205,7 +199,7 @@ tests:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: abort-at=100
     workflow: openshift-upgrade-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   steps:
     cluster_profile: aws-2
     env:
@@ -228,7 +222,7 @@ tests:
     env:
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-vsphere-upi
-- as: e2e-aws-fips
+- as: e2e-aws-ovn-fips
   steps:
     cluster_profile: aws-2
     env:
@@ -278,14 +272,14 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ovn-ipv6
-- as: e2e-aws-single-node
+- as: e2e-aws-ovn-single-node
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-serial
+- as: e2e-aws-ovn-single-node-serial
   optional: true
   steps:
     cluster_profile: aws-2
@@ -293,7 +287,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/conformance/serial
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-upgrade
+- as: e2e-aws-ovn-single-node-upgrade
   optional: true
   steps:
     cluster_profile: aws-2
@@ -324,7 +318,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi-migration
-- as: e2e-aws-cgroupsv2
+- as: e2e-aws-ovn-cgroupsv2
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.12.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.12.yaml
index 603fa28d2842b..28a7e4699833d 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.12.yaml
@@ -59,10 +59,6 @@ releases:
       include_built_images: true
       name: 4.12-priv
       namespace: ocp-private
-  previous:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
 resources:
   '*':
     requests:
@@ -98,7 +94,7 @@ tests:
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-loki
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-e2e-gcp-loki
@@ -125,7 +121,7 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-cmd
+- as: e2e-agnostic-ovn-cmd
   optional: true
   steps:
     cluster_profile: azure4
@@ -179,7 +175,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/image-registry
     workflow: openshift-e2e-aws-image-registry
-- as: e2e-gcp-upgrade
+- as: e2e-gcp-ovn-upgrade
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-upgrade-gcp
@@ -187,8 +183,6 @@ tests:
   optional: true
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     workflow: openshift-upgrade-gcp-ovn-rt
 - as: e2e-gcp-csi
   optional: true
@@ -206,7 +200,7 @@ tests:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: abort-at=100
     workflow: openshift-upgrade-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   steps:
     cluster_profile: aws-2
     env:
@@ -229,7 +223,7 @@ tests:
     env:
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-vsphere-upi
-- as: e2e-aws-fips
+- as: e2e-aws-ovn-fips
   steps:
     cluster_profile: aws-2
     env:
@@ -279,14 +273,14 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ovn-ipv6
-- as: e2e-aws-single-node
+- as: e2e-aws-ovn-single-node
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-serial
+- as: e2e-aws-ovn-single-node-serial
   optional: true
   steps:
     cluster_profile: aws-2
@@ -294,7 +288,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/conformance/serial
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-upgrade
+- as: e2e-aws-ovn-single-node-upgrade
   optional: true
   steps:
     cluster_profile: aws-2
@@ -325,7 +319,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi-migration
-- as: e2e-aws-cgroupsv2
+- as: e2e-aws-ovn-cgroupsv2
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.13.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.13.yaml
index 70073b2606ef8..dced463d5eb22 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.13.yaml
@@ -58,10 +58,6 @@ releases:
       include_built_images: true
       name: 4.13-priv
       namespace: ocp-private
-  previous:
-    integration:
-      name: 4.13-priv
-      namespace: ocp-private
 resources:
   '*':
     requests:
@@ -97,7 +93,7 @@ tests:
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-loki
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-e2e-gcp-loki
@@ -124,7 +120,7 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-cmd
+- as: e2e-agnostic-ovn-cmd
   optional: true
   steps:
     cluster_profile: azure4
@@ -178,7 +174,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/image-registry
     workflow: openshift-e2e-aws-image-registry
-- as: e2e-gcp-upgrade
+- as: e2e-gcp-ovn-upgrade
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-upgrade-gcp
@@ -186,8 +182,6 @@ tests:
   optional: true
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     workflow: openshift-upgrade-gcp-ovn-rt
 - as: e2e-gcp-csi
   optional: true
@@ -205,7 +199,7 @@ tests:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: abort-at=100
     workflow: openshift-upgrade-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   steps:
     cluster_profile: aws-2
     env:
@@ -228,7 +222,7 @@ tests:
     env:
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-vsphere-upi
-- as: e2e-aws-fips
+- as: e2e-aws-ovn-fips
   steps:
     cluster_profile: aws-2
     env:
@@ -278,14 +272,14 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ovn-ipv6
-- as: e2e-aws-single-node
+- as: e2e-aws-ovn-single-node
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-serial
+- as: e2e-aws-ovn-single-node-serial
   optional: true
   steps:
     cluster_profile: aws-2
@@ -293,7 +287,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/conformance/serial
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-upgrade
+- as: e2e-aws-ovn-single-node-upgrade
   optional: true
   steps:
     cluster_profile: aws-2
@@ -324,7 +318,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi-migration
-- as: e2e-aws-cgroupsv2
+- as: e2e-aws-ovn-cgroupsv2
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-master.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-master.yaml
index 81c186599e145..78ee31b7ce28d 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-master.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-master.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -33,7 +33,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 promotion:
   excluded_images:
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-master__periodic.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-master__periodic.yaml
index fae0c2b41c083..6fbae6d0956e6 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-master__periodic.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-master__periodic.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # Container image that has COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -36,7 +36,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 - dockerfile_literal: |
     # Container image used to build RHCOS in Prow build step to be able to push
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.10.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.10.yaml
index 6d31ac6b280e4..5fe1d529aef11 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.10.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_4.10:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.10"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_4.10:
+    coreos_coreos-assembler_latest:
       as:
       - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml
index f600e22b14d5c..3646d77568cab 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:4.11
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -33,7 +33,7 @@ images:
   inputs:
     coreos_coreos-assembler_4.11:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11
+      - registry.ci.openshift.org/coreos/coreos-assembler:4.11
   to: build-image
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml
index 17cc64428cf5b..c76dcfef39159 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -33,7 +33,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12__periodic.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12__periodic.yaml
index 2148e0f96ab77..2d90faa325bd4 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12__periodic.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12__periodic.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # Container image that has COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -36,7 +36,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 - dockerfile_literal: |
     # Container image used to build RHCOS in Prow build step to be able to push
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13.yaml
index 7ee64b7487929..175b8ecbf7761 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -33,7 +33,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 promotion:
   excluded_images:
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13__periodic.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13__periodic.yaml
index e185b4c34544b..a2f04005a22e1 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13__periodic.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.13__periodic.yaml
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_literal: |
     # Container image that has COSA + source code
-    FROM registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+    FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
     WORKDIR /src
     # Tell the build scripts that we have setup a directory for unprivileged build
     ENV COSA_DIR=/tmp/cosa
@@ -36,7 +36,7 @@ images:
   inputs:
     coreos_coreos-assembler_latest:
       as:
-      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
 - dockerfile_literal: |
     # Container image used to build RHCOS in Prow build step to be able to push
diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.9.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.9.yaml
index 0abca6c91baab..5f648a9b64c87 100644
--- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.9.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_4.9:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.9"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -12,7 +12,7 @@ canonical_go_repository: github.com/openshift/os
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_4.9:
+    coreos_coreos-assembler_latest:
       as:
       - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml
index cbc9e5667d7c2..cc2ec2c4d43ab 100644
--- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml
+++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml
@@ -22,6 +22,9 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
+- dockerfile_path: Dockerfile.base
+  from: base
+  to: ovn-kubernetes-base
 - from: base
   inputs:
     ocp_4.12_cli:
@@ -31,6 +34,13 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ovn-kubernetes
+- dockerfile_path: Dockerfile.microshift
+  from: ovn-kubernetes-base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: ovn-kubernetes-microshift
 promotion:
   name: 4.12-priv
   namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.12.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.12.yaml
index 0f2e5c81fdeff..da23dae74b5c8 100644
--- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.12.yaml
@@ -22,6 +22,9 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
+- dockerfile_path: Dockerfile.base
+  from: base
+  to: ovn-kubernetes-base
 - from: base
   inputs:
     ocp_4.12_cli:
@@ -31,6 +34,13 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ovn-kubernetes
+- dockerfile_path: Dockerfile.microshift
+  from: ovn-kubernetes-base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: ovn-kubernetes-microshift
 promotion:
   disabled: true
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.13.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.13.yaml
index 181f94e08b98d..bb8f577be7809 100644
--- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.13.yaml
@@ -22,6 +22,9 @@ build_root:
     tag: golang-1.18
 canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
+- dockerfile_path: Dockerfile.base
+  from: base
+  to: ovn-kubernetes-base
 - from: base
   inputs:
     ocp_4.12_cli:
@@ -31,6 +34,13 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: ovn-kubernetes
+- dockerfile_path: Dockerfile.microshift
+  from: ovn-kubernetes-base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: ovn-kubernetes-microshift
 promotion:
   name: 4.13-priv
   namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-main.yaml b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-main.yaml
index ec1263201e885..c6ce84f61a291 100644
--- a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-main.yaml
+++ b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-main.yaml
@@ -54,23 +54,20 @@ tests:
   commands: make unit
   container:
     from: src
-- as: e2e
+- as: e2e-techpreview
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
-    cluster_profile: gcp
+    cluster_profile: aws
     test:
     - as: test
       cli: latest
-      commands: make e2e
-      dependencies:
-      - env: CLUSTER_PLATFORM_OPERATOR_MANAGER_IMAGE
-        name: cluster-platform-operators-manager
+      commands: make test-e2e
       from: src
       resources:
         requests:
           cpu: 100m
-    workflow: ipi-gcp
+    workflow: openshift-e2e-aws-techpreview
 zz_generated_metadata:
   branch: main
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12.yaml b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12.yaml
index c3d7e69412329..a96c463a36fe1 100644
--- a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12.yaml
@@ -55,23 +55,20 @@ tests:
   commands: make unit
   container:
     from: src
-- as: e2e
+- as: e2e-techpreview
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
-    cluster_profile: gcp
+    cluster_profile: aws
     test:
     - as: test
       cli: latest
-      commands: make e2e
-      dependencies:
-      - env: CLUSTER_PLATFORM_OPERATOR_MANAGER_IMAGE
-        name: cluster-platform-operators-manager
+      commands: make test-e2e
       from: src
       resources:
         requests:
           cpu: 100m
-    workflow: ipi-gcp
+    workflow: openshift-e2e-aws-techpreview
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13.yaml b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13.yaml
index 62f9a6b248e74..9b6101078e51d 100644
--- a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13.yaml
@@ -54,23 +54,20 @@ tests:
   commands: make unit
   container:
     from: src
-- as: e2e
+- as: e2e-techpreview
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
-    cluster_profile: gcp
+    cluster_profile: aws
     test:
     - as: test
       cli: latest
-      commands: make e2e
-      dependencies:
-      - env: CLUSTER_PLATFORM_OPERATOR_MANAGER_IMAGE
-        name: cluster-platform-operators-manager
+      commands: make test-e2e
       from: src
       resources:
         requests:
           cpu: 100m
-    workflow: ipi-gcp
+    workflow: openshift-e2e-aws-techpreview
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv
diff --git a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master.yaml b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master.yaml
index d182802b6c2a7..a0e5fdcd1ce8c 100644
--- a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master.yaml
+++ b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master.yaml
@@ -48,7 +48,7 @@ tests:
   commands: make build && make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12.yaml b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12.yaml
index 1c138c65ac6e1..395fc74956daf 100644
--- a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12.yaml
@@ -49,7 +49,7 @@ tests:
   commands: make build && make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13.yaml b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13.yaml
index 3fa4cff075f64..ab1b9b0e16666 100644
--- a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13.yaml
@@ -48,7 +48,7 @@ tests:
   commands: make build && make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master.yaml b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master.yaml
index de199f5d59756..678dfb018eade 100644
--- a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master.yaml
@@ -47,7 +47,7 @@ tests:
   commands: make fmt
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12.yaml
index 5f135801b5690..b9d8287e71886 100644
--- a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12.yaml
@@ -48,7 +48,7 @@ tests:
   commands: make fmt
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13.yaml
index 27ed214ae1cde..276db339df57b 100644
--- a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13.yaml
@@ -47,7 +47,7 @@ tests:
   commands: make fmt
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main.yaml b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main.yaml
new file mode 100644
index 0000000000000..886e43325f721
--- /dev/null
+++ b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main.yaml
@@ -0,0 +1,72 @@
+base_images:
+  base:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: base
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+binary_build_commands: make build --warn-undefined-variables
+build_root:
+  from_repository: true
+canonical_go_repository: github.com/openshift/route-controller-manager
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: openshift-route-controller-manager
+promotion:
+  name: 4.12-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: "3"
+      memory: 6Gi
+test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
+tests:
+- as: verify
+  commands: |
+    make verify -k --warn-undefined-variables
+  container:
+    from: bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: unit
+  commands: |
+    make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+  container:
+    from: test-bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-upgrade-aws
+- as: e2e-gcp
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: main
+  org: openshift-priv
+  repo: route-controller-manager
diff --git a/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12.yaml b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12.yaml
new file mode 100644
index 0000000000000..37a9f54cad10f
--- /dev/null
+++ b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12.yaml
@@ -0,0 +1,73 @@
+base_images:
+  base:
+    name: 4.12-priv
+    namespace: ocp-private
+    tag: base
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+binary_build_commands: make build --warn-undefined-variables
+build_root:
+  from_repository: true
+canonical_go_repository: github.com/openshift/route-controller-manager
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: openshift-route-controller-manager
+promotion:
+  disabled: true
+  name: 4.12-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.12-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.12-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: "3"
+      memory: 6Gi
+test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
+tests:
+- as: verify
+  commands: |
+    make verify -k --warn-undefined-variables
+  container:
+    from: bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: unit
+  commands: |
+    make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+  container:
+    from: test-bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-upgrade-aws
+- as: e2e-gcp
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.12
+  org: openshift-priv
+  repo: route-controller-manager
diff --git a/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13.yaml b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13.yaml
new file mode 100644
index 0000000000000..7c38e541eefaf
--- /dev/null
+++ b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13.yaml
@@ -0,0 +1,72 @@
+base_images:
+  base:
+    name: 4.13-priv
+    namespace: ocp-private
+    tag: base
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+binary_build_commands: make build --warn-undefined-variables
+build_root:
+  from_repository: true
+canonical_go_repository: github.com/openshift/route-controller-manager
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: openshift-route-controller-manager
+promotion:
+  name: 4.13-priv
+  namespace: ocp-private
+releases:
+  initial:
+    integration:
+      name: 4.13-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.13-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: "3"
+      memory: 6Gi
+test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
+tests:
+- as: verify
+  commands: |
+    make verify -k --warn-undefined-variables
+  container:
+    from: bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: unit
+  commands: |
+    make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+  container:
+    from: test-bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-upgrade-aws
+- as: e2e-gcp
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.13
+  org: openshift-priv
+  repo: route-controller-manager
diff --git a/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml b/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml
index 6af937a54d82b..617a870fa0d22 100644
--- a/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml
+++ b/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml
@@ -7,10 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/router
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.12.yaml b/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.12.yaml
index 6f70324feb307..e2602f9192a72 100644
--- a/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.12.yaml
@@ -7,10 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/router
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.13.yaml b/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.13.yaml
index dc70957ce6b93..b1f76ba8798f4 100644
--- a/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/router/openshift-priv-router-release-4.13.yaml
@@ -7,10 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/router
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-master.yaml b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-master.yaml
index 0043009217e31..f4377b82b1eb3 100644
--- a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-master.yaml
+++ b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-master.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 canonical_go_repository: github.com/openshift/runtime-utils
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.12.yaml b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.12.yaml
index a74f2ddddd3bf..40acf72866416 100644
--- a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.12.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 canonical_go_repository: github.com/openshift/runtime-utils
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.13.yaml b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.13.yaml
index eaf2c74ff43ce..174e978cae3c9 100644
--- a/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/runtime-utils/openshift-priv-runtime-utils-release-4.13.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 canonical_go_repository: github.com/openshift/runtime-utils
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-master.yaml b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-master.yaml
index 34a1cccd33828..b05753b48a1a8 100644
--- a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.12.yaml
index 7267bd04ebad3..056eb229f3cc7 100644
--- a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.13.yaml
index e8d144ecb28de..a773be4c44d57 100644
--- a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-master.yaml b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-master.yaml
index 72e3e1ac07543..45c0c0e202867 100644
--- a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.12.yaml b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.12.yaml
index 30c4121849d36..5d23ef27f4424 100644
--- a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.12-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.13.yaml b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.13.yaml
index 920f5428e69c7..4580f6ba68830 100644
--- a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.13-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/sriov-cni
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.11.yaml
index e521e9758542f..e0b37b34c78c7 100644
--- a/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.11.yaml
@@ -3,10 +3,10 @@ base_images:
     name: 4.11-priv
     namespace: ocp-private
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
   openstack-installer:
     name: 4.11-priv
     namespace: ocp-private
@@ -34,23 +34,23 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-webhook
 operator:
   bundles:
diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml
index 2566d743afe79..984774fdd834c 100644
--- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml
+++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml
index a977698a6d35d..7e04824d6dd61 100644
--- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml
@@ -54,7 +54,7 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml
index 1557854cab196..2234e85fd92a8 100644
--- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-master.yaml b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-master.yaml
index dc961fe0cb3cd..c33d6ee902b3e 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-master.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-master.yaml
@@ -1,17 +1,17 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/windows-machine-config-bootstrapper
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: 4.12-priv
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.11.yaml b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.11.yaml
index 2ee4931cd0f86..2499371e19689 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.11.yaml
@@ -1,17 +1,17 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/windows-machine-config-bootstrapper
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: 4.11-priv
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.12.yaml b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.12.yaml
index 2ce60a7859e56..c18f83131e6c5 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.12.yaml
@@ -1,17 +1,17 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/windows-machine-config-bootstrapper
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.13.yaml b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.13.yaml
index c1ebfd7a87bb3..699a508b76940 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-bootstrapper/openshift-priv-windows-machine-config-bootstrapper-release-4.13.yaml
@@ -1,17 +1,17 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/windows-machine-config-bootstrapper
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: 4.13-priv
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml
index 4d7df02679c19..2edea758cbb8a 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml
@@ -33,10 +33,6 @@ promotion:
   name: 4.12-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -108,7 +104,7 @@ tests:
     - ref: windows-e2e-operator-test
     workflow: openshift-e2e-azure-ccm-ovn-hybrid-install
 - as: gcp-e2e-operator
-  optional: true
+  skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: gcp
     test:
@@ -121,6 +117,13 @@ tests:
     test:
     - ref: windows-e2e-operator-test-with-custom-vxlan-port
     workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
+- as: vsphere-e2e-ccm-install
+  optional: true
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: openshift-e2e-vsphere-ccm-ovn-hybrid-install
 - as: aws-e2e-upgrade
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -132,6 +135,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.10.yaml
index 7e785a5e06a2b..a0a5595b981a8 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.10.yaml
@@ -26,10 +26,6 @@ promotion:
   name: 4.10-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.10-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -116,6 +112,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.11.yaml
index a40ae33e75857..7b41187895809 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.11.yaml
@@ -33,10 +33,6 @@ promotion:
   name: 4.11-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.11-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -125,6 +121,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml
index 3421c13e8fbe7..7f4d60a5247ed 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml
@@ -34,10 +34,6 @@ promotion:
   name: 4.12-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.12-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -109,7 +105,7 @@ tests:
     - ref: windows-e2e-operator-test
     workflow: openshift-e2e-azure-ccm-ovn-hybrid-install
 - as: gcp-e2e-operator
-  optional: true
+  skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: gcp
     test:
@@ -122,6 +118,13 @@ tests:
     test:
     - ref: windows-e2e-operator-test-with-custom-vxlan-port
     workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
+- as: vsphere-e2e-ccm-install
+  optional: true
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: openshift-e2e-vsphere-ccm-ovn-hybrid-install
 - as: aws-e2e-upgrade
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -133,6 +136,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml
index c075138c14427..e608cdc562a99 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml
@@ -33,10 +33,6 @@ promotion:
   name: 4.13-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.13-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -108,7 +104,7 @@ tests:
     - ref: windows-e2e-operator-test
     workflow: openshift-e2e-azure-ccm-ovn-hybrid-install
 - as: gcp-e2e-operator
-  optional: true
+  skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: gcp
     test:
@@ -121,6 +117,13 @@ tests:
     test:
     - ref: windows-e2e-operator-test-with-custom-vxlan-port
     workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
+- as: vsphere-e2e-ccm-install
+  optional: true
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: openshift-e2e-vsphere-ccm-ovn-hybrid-install
 - as: aws-e2e-upgrade
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -132,6 +135,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.8.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.8.yaml
index 94c6fdb575b41..b1fab3a34c7ce 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.8.yaml
@@ -26,10 +26,6 @@ promotion:
   name: 4.8-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.8-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -102,6 +98,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.9.yaml
index 3b8923aecd611..8267257f51115 100644
--- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.9.yaml
@@ -26,10 +26,6 @@ promotion:
   name: 4.9-priv
   namespace: ocp-private
 releases:
-  initial:
-    integration:
-      name: 4.9-priv
-      namespace: ocp-private
   latest:
     integration:
       include_built_images: true
@@ -102,6 +98,7 @@ tests:
       OO_TARGET_NAMESPACES: '!install'
     test:
     - as: e2e-aws-upgrade
+      cli: latest
       commands: |-
         #!/bin/bash
         set -euo pipefail
diff --git a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-master.yaml b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-master.yaml
index 42e2972b8d319..b7da7545f3fba 100644
--- a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-master.yaml
+++ b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.12.yaml
index e0821b66e19cc..beefbf98def16 100644
--- a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.12.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.13.yaml
index 67441ce03e220..e6d3ff2c7c7b4 100644
--- a/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/alibaba-disk-csi-driver-operator/openshift-alibaba-disk-csi-driver-operator-release-4.13.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
index 294781936e890..5b5983a26728d 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master__edge.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master__edge.yaml
index 1503383a9aa48..ae94d071d2922 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master__edge.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master__edge.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.12.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.12.yaml
index 871dc292f9143..1a01a57d284cb 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.12.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.12.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.13.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.13.yaml
index dbdec959fc2a7..ae17e6b91ca2f 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.13.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.13.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.ocp
+- dockerfile_path: ./Dockerfile.ocp
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-node-agent
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.5.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.5.yaml
index 9f224916cd381..1cf823db58039 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.5.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.5.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.5
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.5
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.6.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.6.yaml
index e805acb91fc99..7112442c5d0db 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.6.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-ocm-2.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.6
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.6
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
index 4f0a3c0bf2c85..40410df78a514 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
@@ -11,17 +11,24 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml
index 984a38791fe22..a66f9ae69ed0e 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer-agent:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.12.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.12.yaml
index 83ff280afc371..f0d292972dd5e 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.12.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.12.yaml
@@ -11,17 +11,24 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.13.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.13.yaml
index ebedac0de28cd..203bd6098abc5 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.13.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.13.yaml
@@ -11,17 +11,24 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.18-openshift-4.11
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-installer.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: agent-installer-orchestrator
-- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
+- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.6.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.6.yaml
index 7067cf78f18ac..c68a6462ca411 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.6.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.6
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer-agent:
     name: ocm-2.6
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml
index 35a33b73364ac..8d38b17928a4a 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
index 92464193dde3e..fef21b8099210 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
@@ -14,7 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml
index d8328d56083b4..ef49a0c83833b 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml
@@ -31,10 +31,6 @@ base_images:
     name: ocm-2.7
     namespace: edge-infrastructure
     tag: cluster-api-provider-agent
-  coreos_centos_stream8:
-    name: stream8
-    namespace: coreos
-    tag: "8"
   coreos_centos_stream9:
     name: stream9
     namespace: coreos
@@ -170,9 +166,6 @@ images:
   to: assisted-service-build
 - dockerfile_path: Dockerfile.assisted-service
   inputs:
-    coreos_centos_stream8:
-      as:
-      - quay.io/centos/centos:stream8
     openshift_release_golang-1.17:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.17
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__mce.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__mce.yaml
index f57d9abf80252..cfd8f3ae8287d 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__mce.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__mce.yaml
@@ -1,8 +1,4 @@
 base_images:
-  coreos_centos_stream8:
-    name: stream8
-    namespace: coreos
-    tag: "8"
   openshift_release_golang-1.17:
     name: release
     namespace: openshift
@@ -15,9 +11,6 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.assisted-service
   inputs:
-    coreos_centos_stream8:
-      as:
-      - quay.io/centos/centos:stream8
     openshift_release_golang-1.17:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.17
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.12.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.12.yaml
index a0b186f8fdfb3..0f969f91ebd2e 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.12.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.12.yaml
@@ -14,7 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.13.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.13.yaml
index 7bc3c880b7f5b..8d86368e75dcc 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.13.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.13.yaml
@@ -14,7 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.assisted-service.ocp
+- dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: base
   inputs:
     ocp_4.11_cli:
diff --git a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml
index ecb86d3d51766..ec8a50773ecba 100644
--- a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml
+++ b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.4.yaml b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.4.yaml
index 79bbb7523be79..8c4890ac01271 100644
--- a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.4.yaml
+++ b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.4.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.4
-    namespace: edge-infrastructure
-    tag: assisted-installer
   assisted-installer:
     name: ocm-2.4
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.5.yaml b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.5.yaml
index 36909ecce65bb..80cfccb0b2b34 100644
--- a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.5.yaml
+++ b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.5.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.5
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.5
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.6.yaml b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.6.yaml
index d44cff2c1b55d..a5beeff451e54 100644
--- a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.6.yaml
+++ b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-release-ocm-2.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.6
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.6
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12.yaml
index d0f462260b553..b30bab80c59b0 100644
--- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12.yaml
@@ -57,10 +57,13 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13.yaml b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13.yaml
index 4d1995697e6b2..4f62328214ba9 100644
--- a/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13.yaml
@@ -56,10 +56,13 @@ tests:
   container:
     from: src
   skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   optional: true
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.12.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.12.yaml
index df2c8210c68d7..b26abee15866f 100644
--- a/ci-operator/config/openshift/builder/openshift-builder-release-4.12.yaml
+++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.12.yaml
@@ -47,7 +47,7 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.13.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.13.yaml
index 8dc84142fcffc..48ee626d3623f 100644
--- a/ci-operator/config/openshift/builder/openshift-builder-release-4.13.yaml
+++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.13.yaml
@@ -46,7 +46,7 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml
index 9323b44eff375..b3cb1df73c2c7 100644
--- a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml
+++ b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml
@@ -1,4 +1,8 @@
 base_images:
+  ci_nginx-unprivileged_stable:
+    name: nginx-unprivileged
+    namespace: ci
+    tag: stable
   cli:
     name: "4.11"
     namespace: ocp
@@ -49,6 +53,10 @@ images:
         source_path: /go/bin/check-gh-automation
   to: check-gh-automation
 - context_dir: images/gh-pull-through-cache/
+  inputs:
+    ci_nginx-unprivileged_stable:
+      as:
+      - registry.ci.openshift.org/ci/nginx-unprivileged:stable
   to: gh-pull-through-cache
 - context_dir: images/cvp-trigger/
   from: os
diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12.yaml
index 8f297d314b64d..3962588669faf 100644
--- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12.yaml
@@ -72,7 +72,7 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: cloud-credential-operator-codecov-token
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13.yaml
index 679c98ce0c264..a868694cb228b 100644
--- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13.yaml
@@ -71,7 +71,7 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: cloud-credential-operator-codecov-token
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12.yaml
index f9f02ad4c823a..21bdc18f02c6c 100644
--- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12.yaml
+++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12.yaml
@@ -42,15 +42,15 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
@@ -67,6 +67,32 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-ovn-serial
+- as: e2e-openstack-sdn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OpenShiftSDN
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
+- as: e2e-openstack-ovn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OVNKubernetes
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
 zz_generated_metadata:
   branch: release-4.12
   org: openshift
diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13.yaml
index adbac1bd4e604..774e5cadb9fd1 100644
--- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13.yaml
+++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13.yaml
@@ -41,15 +41,15 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
@@ -66,6 +66,32 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-ovn-serial
+- as: e2e-openstack-sdn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OpenShiftSDN
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
+- as: e2e-openstack-ovn-serial-e2e-only
+  optional: true
+  steps:
+    cluster_profile: openstack-vexxhost
+    env:
+      BASE_DOMAIN: shiftstack.devcluster.openshift.com
+      CONFIG_TYPE: minimal
+      NETWORK_TYPE: OVNKubernetes
+      TEST_ARGS: --run \[sig-network\]\[Feature:EgressIP\]
+      TEST_SUITE: openshift/conformance/serial
+    test:
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-openstack-ipi
 zz_generated_metadata:
   branch: release-4.13
   org: openshift
diff --git a/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12.yaml b/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12.yaml
index 940e8da4ee806..1f5d8d2811b8a 100644
--- a/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12.yaml
+++ b/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12.yaml
@@ -36,7 +36,7 @@ releases:
 resources:
   '*':
     limits:
-      memory: 4Gi
+      memory: 6Gi
     requests:
       cpu: 100m
       memory: 200Mi
@@ -45,6 +45,19 @@ tests:
   commands: make gofmt
   container:
     from: src
+- as: lint
+  commands: GOLANGCI_LINT_CACHE=/tmp/.cache GOFLAGS="-mod=readonly" make golint
+  container:
+    from: src
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: e2e-alibabacloud
+  optional: true
+  steps:
+    cluster_profile: alibabacloud
+    workflow: openshift-e2e-alibabacloud
 zz_generated_metadata:
   branch: release-4.12
   org: openshift
diff --git a/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13.yaml b/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13.yaml
index 987dcb25cb59d..924f8a638c144 100644
--- a/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13.yaml
+++ b/ci-operator/config/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13.yaml
@@ -35,7 +35,7 @@ releases:
 resources:
   '*':
     limits:
-      memory: 4Gi
+      memory: 6Gi
     requests:
       cpu: 100m
       memory: 200Mi
@@ -44,6 +44,19 @@ tests:
   commands: make gofmt
   container:
     from: src
+- as: lint
+  commands: GOLANGCI_LINT_CACHE=/tmp/.cache GOFLAGS="-mod=readonly" make golint
+  container:
+    from: src
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: e2e-alibabacloud
+  optional: true
+  steps:
+    cluster_profile: alibabacloud
+    workflow: openshift-e2e-alibabacloud
 zz_generated_metadata:
   branch: release-4.13
   org: openshift
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master.yaml
index 76f5f09247684..ed4e17f2582f7 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.12.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.12.yaml
index 05eab7a322ab5..ee1919d45bfc6 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.12.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.13.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.13.yaml
index 5af94ba38be24..9f5f95b7a907d 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.13.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: gcp-cloud-controller-manager
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-main.yaml b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-main.yaml
index 8a3f5297def5a..15ffde0a1d717 100644
--- a/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-main.yaml
+++ b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-main.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.12
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
 binary_build_commands: go build .
 build_root:
   image_stream_tag:
@@ -18,9 +18,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: nutanix-controller-manager
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12.yaml b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12.yaml
new file mode 100644
index 0000000000000..7bb0ebdf6ed81
--- /dev/null
+++ b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12.yaml
@@ -0,0 +1,62 @@
+base_images:
+  base:
+    name: "4.12"
+    namespace: ocp
+    tag: base
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
+binary_build_commands: go build .
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.17
+canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
+images:
+- dockerfile_path: openshift/Dockerfile.openshift
+  from: base
+  inputs:
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
+  to: nutanix-controller-manager
+promotion:
+  disabled: true
+  name: "4.12"
+  namespace: ocp
+releases:
+  initial:
+    integration:
+      name: "4.12"
+      namespace: ocp
+  latest:
+    integration:
+      include_built_images: true
+      name: "4.12"
+      namespace: ocp
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-nutanix
+  steps:
+    cluster_profile: nutanix
+    workflow: openshift-e2e-nutanix
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: fmt
+  commands: test -z $(gofmt -l $(find . -type f -name '*.go'| grep -v "/vendor/"))
+  container:
+    from: src
+zz_generated_metadata:
+  branch: release-4.12
+  org: openshift
+  repo: cloud-provider-nutanix
diff --git a/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13.yaml b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13.yaml
new file mode 100644
index 0000000000000..ce11562c4e107
--- /dev/null
+++ b/ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13.yaml
@@ -0,0 +1,61 @@
+base_images:
+  base:
+    name: "4.13"
+    namespace: ocp
+    tag: base
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
+binary_build_commands: go build .
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.17
+canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
+images:
+- dockerfile_path: openshift/Dockerfile.openshift
+  from: base
+  inputs:
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
+  to: nutanix-controller-manager
+promotion:
+  name: "4.13"
+  namespace: ocp
+releases:
+  initial:
+    integration:
+      name: "4.13"
+      namespace: ocp
+  latest:
+    integration:
+      include_built_images: true
+      name: "4.13"
+      namespace: ocp
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: e2e-nutanix
+  steps:
+    cluster_profile: nutanix
+    workflow: openshift-e2e-nutanix
+- as: unit
+  commands: make unit-test
+  container:
+    from: src
+- as: fmt
+  commands: test -z $(gofmt -l $(find . -type f -name '*.go'| grep -v "/vendor/"))
+  container:
+    from: src
+zz_generated_metadata:
+  branch: release-4.13
+  org: openshift
+  repo: cloud-provider-nutanix
diff --git a/ci-operator/config/openshift/cluster-api-provider-agent/openshift-cluster-api-provider-agent-release-ocm-2.5.yaml b/ci-operator/config/openshift/cluster-api-provider-agent/openshift-cluster-api-provider-agent-release-ocm-2.5.yaml
index 22be6e95be4b4..d911ac6d1db3b 100644
--- a/ci-operator/config/openshift/cluster-api-provider-agent/openshift-cluster-api-provider-agent-release-ocm-2.5.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-agent/openshift-cluster-api-provider-agent-release-ocm-2.5.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.5
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.5
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml
index 843bd0b288ea1..efe274ae6e85e 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12.yaml
index c919aae18170f..e8c12be80e444 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   disabled: true
@@ -46,7 +46,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13.yaml
index 00a2433caed1e..50a5afe9a867e 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 binary_build_commands: make manager
 build_root:
   from_repository: true
@@ -15,9 +15,9 @@ images:
 - dockerfile_path: openshift/Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: aws-cluster-api-controllers
 promotion:
   name: "4.13"
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.12.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.12.yaml
index b4b82ab98c130..740a2f0ff8d50 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.12.yaml
@@ -46,7 +46,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.13.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.13.yaml
index 2fce1f97a9d10..df7fba8f93b93 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.13.yaml
@@ -45,7 +45,7 @@ tests:
   commands: openshift/unit-tests.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml
index 7d03b6c96554e..644eb9d19557c 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,18 +27,18 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml
index 55f3ad7551df4..bb6228a2bed4d 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml
index 34eaeb5b315b4..2523c2d3dcd9d 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12.yaml
index 8f651b8812186..c4ae06c0288f3 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,18 +27,18 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   disabled: true
@@ -96,10 +92,13 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13.yaml
index 337a4646a7c22..1942849155022 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -31,18 +27,18 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-baremetal-operator
 promotion:
   name: "4.13"
@@ -95,10 +91,13 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml
index 3248076004f4a..3fe855e7faf70 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml
index 4a68646a327a0..b1bb717420b2c 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml
index b296beed6a79f..f4d56fcb9e643 100644
--- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml
index e95085558f9c2..fa200b52ee1ad 100644
--- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml
@@ -11,7 +11,8 @@ binary_build_commands: go build cmd/cluster-cloud-controller-manager-operator/ma
 build_root:
   from_repository: true
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml
index c05b925638430..43e0dbd145372 100644
--- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml
@@ -11,7 +11,8 @@ binary_build_commands: go build cmd/cluster-cloud-controller-manager-operator/ma
 build_root:
   from_repository: true
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml
index 19e37b853c316..53e6ccd3e400e 100644
--- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml
@@ -11,7 +11,8 @@ binary_build_commands: go build cmd/cluster-cloud-controller-manager-operator/ma
 build_root:
   from_repository: true
 images:
-- from: base
+- dockerfile_path: Dockerfile
+  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12.yaml
index 53472bd697cdc..b5b811d102cd5 100644
--- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12.yaml
@@ -55,7 +55,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13.yaml
index c01dc5b68bca6..6f5fb7d60a08e 100644
--- a/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13.yaml
@@ -54,7 +54,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
index 3bd1fd1759f2d..001ec82d0d00f 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml
index a69e4969e1df4..a99503e9d57a7 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12.yaml
@@ -3,22 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.11
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   disabled: true
@@ -66,7 +63,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml
index 2a969b93724df..e0fd291bdeddc 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13.yaml
@@ -3,22 +3,19 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.11
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-control-plane-machine-set-operator
 promotion:
   name: "4.13"
@@ -65,7 +62,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12.yaml
index bc162754d863b..85acae7e7cbbb 100644
--- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12.yaml
@@ -44,7 +44,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13.yaml
index 3b51c450fb995..af3ef45461cfa 100644
--- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13.yaml
@@ -43,7 +43,7 @@ tests:
   commands: make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
index e64c8f011d9bf..d231b4251bbb0 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml
index b7ecbe8d6cb53..bb187eed30525 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml
index 7390a8c2ce83e..e3f88309d7eb5 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.12.yaml
index 72f8961fc229f..e92c0bebba80e 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -124,7 +120,6 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
@@ -230,7 +225,6 @@ tests:
       TEST_UPGRADE_OPTIONS: ""
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-serial
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.13.yaml
index 39852f8e7bb1c..ad48ee93917eb 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -123,7 +119,6 @@ tests:
     workflow: openshift-e2e-gcp-disruption
 - as: e2e-gcp-disruptive-ovn
   optional: true
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-disruption-ovn
@@ -229,7 +224,6 @@ tests:
       TEST_UPGRADE_OPTIONS: ""
     workflow: openshift-upgrade-gcp
 - as: e2e-aws-serial
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml
index 6bd4b682eeefd..38659acc6ae90 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml
index 69c7cbb4d6892..e4bd14338d9d1 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml
index 3548ce3ba42f4..9168254bfcfa0 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml
index f38a186e1be25..0d34118ff31a9 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12.yaml
index 6d4bed6ae80a9..33b32de675cd3 100644
--- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12.yaml
@@ -90,7 +90,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
   steps:
diff --git a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13.yaml
index 817561fc25b2d..089c834018647 100644
--- a/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13.yaml
@@ -89,7 +89,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
   steps:
diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12.yaml
index ecd82e3d511f5..e974c7e2b568c 100644
--- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12.yaml
@@ -71,7 +71,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp-serial
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13.yaml
index 959619d1c2336..13714ca2ff9aa 100644
--- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13.yaml
@@ -70,7 +70,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-kubernetes-e2e-gcp-serial
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-loki
diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml
index 96054f5109334..8b2eb22730ab2 100644
--- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml
@@ -51,10 +51,6 @@ base_images:
     name: "4.11"
     namespace: ocp
     tag: oauth-proxy
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.11
 build_root:
   image_stream_tag:
     name: release
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml
index f53cf02da5455..55b37942ec9f0 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml
@@ -213,6 +213,45 @@ tests:
   container:
     clone: true
     from: golangci-lint
+- as: e2e-network-mtu-migration-ovn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-ovn
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-ovn-ipv6
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      MTU_DECREASE: "100"
+      MTU_INCREASE: "50"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - chain: baremetalds-ipi-test
+    workflow: baremetalds-e2e-ovn-ipv6
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-sdn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-sdn
+  timeout: 5h0m0s
 zz_generated_metadata:
   branch: release-4.12
   org: openshift
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13.yaml
index b52c1599abf03..ed179956e8939 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13.yaml
@@ -212,6 +212,45 @@ tests:
   container:
     clone: true
     from: golangci-lint
+- as: e2e-network-mtu-migration-ovn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-ovn
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-ovn-ipv6
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    env:
+      MTU_DECREASE: "100"
+      MTU_INCREASE: "50"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - chain: baremetalds-ipi-test
+    workflow: baremetalds-e2e-ovn-ipv6
+  timeout: 5h0m0s
+- as: e2e-network-mtu-migration-sdn-ipv4
+  optional: true
+  steps:
+    cluster_profile: gcp
+    env:
+      MTU_DECREASE: "400"
+      MTU_INCREASE: "200"
+    test:
+    - chain: network-mtu-migration-decrease
+    - chain: network-mtu-migration-increase
+    - ref: openshift-e2e-test
+    workflow: openshift-e2e-gcp-sdn
+  timeout: 5h0m0s
 zz_generated_metadata:
   branch: release-4.13
   org: openshift
diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12.yaml
index 165957b4b083f..b6753ba55e269 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13.yaml
index 49ec5b4287bcc..cf84eecafe7da 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13.yaml
@@ -51,7 +51,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12.yaml
index 95a97848a215a..ed2018265a98e 100644
--- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12.yaml
@@ -48,7 +48,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13.yaml
index 2d1e05045daae..9423e4b577d41 100644
--- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13.yaml
@@ -47,7 +47,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12.yaml
index 0f8c2df3babfc..62c734b55164b 100644
--- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12.yaml
@@ -50,7 +50,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13.yaml
index ec6ab43f7427a..ce1c74ee007ec 100644
--- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13.yaml
@@ -49,7 +49,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12__okd.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12__okd.yaml
index ffbebfd2596f2..2b7cb73643381 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12__okd.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12__okd.yaml
@@ -46,7 +46,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13__okd.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13__okd.yaml
index 99cc1aba7e027..0937258619360 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13__okd.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13__okd.yaml
@@ -45,7 +45,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml
index 8a0737d44bdec..93c72bd30fc93 100644
--- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master.yaml
@@ -3,18 +3,18 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml
index 020716967c52b..a29df99143c5d 100644
--- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12.yaml
@@ -3,18 +3,18 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   disabled: true
@@ -44,7 +44,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
@@ -57,7 +57,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -86,7 +86,7 @@ tests:
       TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
         on the same node
     workflow: openshift-e2e-vsphere-csi
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   steps:
     cluster_profile: azure4
diff --git a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13.yaml
index f5d446c7ec627..85708fbc3d586 100644
--- a/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13.yaml
@@ -3,18 +3,18 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cluster-storage-operator
 promotion:
   name: "4.13"
@@ -43,7 +43,7 @@ tests:
   commands: make verify
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
@@ -56,7 +56,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
@@ -85,7 +85,7 @@ tests:
       TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
         on the same node
     workflow: openshift-e2e-vsphere-csi
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   steps:
     cluster_profile: azure4
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12.yaml
index 334c22244a60c..8bbebde166168 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12.yaml
@@ -80,13 +80,18 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
+    workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
   branch: release-4.12
diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13.yaml
index c46ecea0a9373..d5c9ded48a2b0 100644
--- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13.yaml
@@ -79,13 +79,18 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
+    workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
   branch: release-4.13
diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml
index 35f173bce4249..aa6a017e8bdce 100644
--- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml
@@ -58,7 +58,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml
index 0cd3569f5ff84..f268bf33a03db 100644
--- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml
@@ -57,7 +57,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-aws
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
index 7fb3d4b0ca0a7..a6e6458eaac1f 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
@@ -13,8 +13,7 @@ build_root:
     namespace: openshift
     tag: golang-1.18
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.12.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.12.yaml
index 99e6fcd5d542e..8e5b3c2e6ab0d 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.12.yaml
@@ -13,8 +13,7 @@ build_root:
     namespace: openshift
     tag: golang-1.18
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.13.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.13.yaml
index d675db21ade27..14fda5ecd0c13 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.13.yaml
@@ -13,8 +13,7 @@ build_root:
     namespace: openshift
     tag: golang-1.18
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
index 7267a3022815b..c90de9cf98ffd 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.12.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.12.yaml
index 35d4564a12cf3..be25893820f13 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.12.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.12.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.13.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.13.yaml
index acaab55e89b97..00d507d6660d3 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.13.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.13.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml
index d5a54739bbbca..7b8117040ed5f 100644
--- a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml
+++ b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
diff --git a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.12.yaml b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.12.yaml
index beda36e2bfc42..0d392a25a093d 100644
--- a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.12.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
@@ -22,14 +18,10 @@ images:
 operator:
   bundles:
   - as: file-integrity-operator-bundle
-    base_index: operator-index
     context_dir: .
     dockerfile_path: bundle.Dockerfile
-    update_graph: replaces
   substitutions:
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
-    with: pipeline:file-integrity-operator
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
+  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.30
     with: pipeline:file-integrity-operator
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.13.yaml b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.13.yaml
index 3ac022e3906f2..05340697b8cb5 100644
--- a/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.13.yaml
@@ -3,10 +3,6 @@ base_images:
     name: release
     namespace: openshift
     tag: rhel-8-release-golang-1.17-openshift-4.10
-  operator-index:
-    name: redhat-operator-index
-    namespace: ci
-    tag: v4.10
 build_root:
   image_stream_tag:
     name: release
@@ -22,14 +18,10 @@ images:
 operator:
   bundles:
   - as: file-integrity-operator-bundle
-    base_index: operator-index
     context_dir: .
     dockerfile_path: bundle.Dockerfile
-    update_graph: replaces
   substitutions:
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
-    with: pipeline:file-integrity-operator
-  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
+  - pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.30
     with: pipeline:file-integrity-operator
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12.yaml
index 07d624715ac59..72964d65c2cae 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12.yaml
@@ -1,14 +1,85 @@
 base_images:
+  attacher-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-external-attacher
   base:
     name: "4.12"
     namespace: ocp
     tag: base
+  driver-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: gcp-filestore-csi-driver
+  livenessprobe-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-livenessprobe
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.10
+  provisioner-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-external-provisioner
+  proxy-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: kube-rbac-proxy
+  registrar-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-node-driver-registrar
+  resizer-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-external-resizer
+  snapshotter-operand:
+    name: "4.12"
+    namespace: ocp
+    tag: csi-external-snapshotter
 binary_build_commands: make
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
+  from_repository: true
+images:
+- dockerfile_path: Dockerfile.openshift
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: gcp-filestore-csi-driver-operator
+operator:
+  bundles:
+  - as: gcp-filestore-csi-driver-operator-bundle
+    base_index: operator-index
+    context_dir: config
+    dockerfile_path: bundle.Dockerfile
+    update_graph: replaces
+  substitutions:
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver-operator:latest
+    with: pipeline:gcp-filestore-csi-driver-operator
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver:latest
+    with: pipeline:driver-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:provisioner-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:attacher-operand
+  - pullspec: quay.io/openshift/origin-csi-external-snapshotter:latest
+    with: pipeline:snapshotter-operand
+  - pullspec: quay.io/openshift/origin-csi-external-resizer:latest
+    with: pipeline:resizer-operand
+  - pullspec: quay.io/openshift/origin-csi-node-driver-registrar:latest
+    with: pipeline:registrar-operand
+  - pullspec: quay.io/openshift/origin-csi-livenessprobe:latest
+    with: pipeline:livenessprobe-operand
+  - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
+    with: pipeline:proxy-operand
 promotion:
   disabled: true
   name: "4.12"
@@ -32,10 +103,42 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: unit
-  commands: make test-unit
+- as: verify
+  commands: make verify
   container:
     from: src
+- as: operator-e2e
+  optional: true
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
+- as: nightly-operator-e2e
+  cron: 0 */12 * * *
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
 zz_generated_metadata:
   branch: release-4.12
   org: openshift
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13.yaml
index f92118ce6054a..39202afd18b61 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13.yaml
@@ -1,14 +1,85 @@
 base_images:
+  attacher-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-external-attacher
   base:
     name: "4.13"
     namespace: ocp
     tag: base
+  driver-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: gcp-filestore-csi-driver
+  livenessprobe-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-livenessprobe
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.10
+  provisioner-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-external-provisioner
+  proxy-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: kube-rbac-proxy
+  registrar-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-node-driver-registrar
+  resizer-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-external-resizer
+  snapshotter-operand:
+    name: "4.13"
+    namespace: ocp
+    tag: csi-external-snapshotter
 binary_build_commands: make
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.18
+  from_repository: true
+images:
+- dockerfile_path: Dockerfile.openshift
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: gcp-filestore-csi-driver-operator
+operator:
+  bundles:
+  - as: gcp-filestore-csi-driver-operator-bundle
+    base_index: operator-index
+    context_dir: config
+    dockerfile_path: bundle.Dockerfile
+    update_graph: replaces
+  substitutions:
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver-operator:latest
+    with: pipeline:gcp-filestore-csi-driver-operator
+  - pullspec: quay.io/openshift/origin-gcp-filestore-csi-driver:latest
+    with: pipeline:driver-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:provisioner-operand
+  - pullspec: quay.io/openshift/origin-csi-external-provisioner:latest
+    with: pipeline:attacher-operand
+  - pullspec: quay.io/openshift/origin-csi-external-snapshotter:latest
+    with: pipeline:snapshotter-operand
+  - pullspec: quay.io/openshift/origin-csi-external-resizer:latest
+    with: pipeline:resizer-operand
+  - pullspec: quay.io/openshift/origin-csi-node-driver-registrar:latest
+    with: pipeline:registrar-operand
+  - pullspec: quay.io/openshift/origin-csi-livenessprobe:latest
+    with: pipeline:livenessprobe-operand
+  - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
+    with: pipeline:proxy-operand
 promotion:
   name: "4.13"
   namespace: ocp
@@ -31,10 +102,42 @@ resources:
       memory: 200Mi
 test_binary_build_commands: make test
 tests:
-- as: unit
-  commands: make test-unit
+- as: verify
+  commands: make verify
   container:
     from: src
+- as: operator-e2e
+  optional: true
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
+- as: nightly-operator-e2e
+  cron: 0 */12 * * *
+  steps:
+    cluster_profile: gcp
+    dependencies:
+      OO_INDEX: ci-index-gcp-filestore-csi-driver-operator-bundle
+    env:
+      CLUSTERCSIDRIVER: filestore.csi.storage.gke.io
+      OO_CHANNEL: preview
+      OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers
+      OO_PACKAGE: gcp-filestore-csi-driver-operator
+      OO_TARGET_NAMESPACES: '!all'
+      TEST_CSI_DRIVER_MANIFEST: manifest-gcp-filestore.yaml
+      TEST_SUITE: openshift/csi
+      TRUECONDITIONS: GCPFilestoreDriverControllerServiceControllerAvailable GCPFilestoreDriverNodeServiceControllerAvailable
+    workflow: openshift-e2e-gcp-csi-filestore
 zz_generated_metadata:
   branch: release-4.13
   org: openshift
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
index 1ce52b0763b61..1ab64f7805541 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11.yaml
index 5b16e03a516d4..08140a82b3c1e 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.12.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.12.yaml
index 95bb10bb0b4f1..197b0e2ae8083 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.12.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -70,12 +66,16 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true
       name: "4.12"
       namespace: ocp
+  previous:
+    release:
+      channel: stable
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -129,6 +129,8 @@ tests:
   optional: true
   steps:
     cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     test:
     - as: deploy-cnv
       cli: latest
@@ -144,7 +146,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -179,6 +181,10 @@ tests:
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: gcp
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
+    env:
+      COMPUTE_NODE_TYPE: n2-standard-4
     test:
     - as: deploy-cnv
       cli: latest
@@ -194,7 +200,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.13.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.13.yaml
index 7b74f3f6f6155..c9f699865a991 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.13.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
@@ -69,12 +65,16 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true
       name: "4.13"
       namespace: ocp
+  previous:
+    release:
+      channel: stable
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -128,6 +128,8 @@ tests:
   optional: true
   steps:
     cluster_profile: azure4
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     test:
     - as: deploy-cnv
       cli: latest
@@ -143,7 +145,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
@@ -178,6 +180,10 @@ tests:
   skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: gcp
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
+    env:
+      COMPUTE_NODE_TYPE: n2-standard-4
     test:
     - as: deploy-cnv
       cli: latest
@@ -193,7 +199,7 @@ tests:
         # install hypershift
         bin/hypershift install --hypershift-image ${HYPERSHIFT_RELEASE_LATEST}
 
-        # complie the e2e tests
+        # compile the e2e tests
         make e2e
 
         # run the test
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
index 56348812f5e6e..e3726f7517d93 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.11.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.11.yaml
index 7e14c8f4e0563..95992fafc1e6a 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.11.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.11.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.11"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-infiniband-cni
 promotion:
   name: "4.11"
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.12.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.12.yaml
index d3ea3ed376336..3b07b346932e2 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.12.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.12.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.13.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.13.yaml
index 0e865e9b52192..a09c56b685b72 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.13.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.13.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-infiniband-cni
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-master.yaml b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-master.yaml
index 4142480ec615e..d630ea30c1864 100644
--- a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-master.yaml
+++ b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
index 4eab6fca342dd..71c1f960db4a5 100644
--- a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.12.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
index fdade6530f35b..af61166ac6b87 100644
--- a/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-release-4.13.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.11.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.11.yaml
index 97967c873bf75..621cb9808b5eb 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.11.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.11.yaml
@@ -7,18 +7,18 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
 build_root:
   from_repository: true
 images:
 - from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: machine-image-customization-controller
 promotion:
   name: "4.11"
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12.yaml
index 40f9ca1b84c6f..0830904ef25fa 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12.yaml
@@ -51,10 +51,13 @@ tests:
   commands: make lint
   container:
     from: src
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13.yaml
index cb4778b35fe7f..22d81fe7997fe 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13.yaml
@@ -50,10 +50,13 @@ tests:
   commands: make lint
   container:
     from: src
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn-bm
+  cluster: build05
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.12.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.12.yaml
index 780174932352b..9714738277a8a 100644
--- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.12.yaml
+++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.12.yaml
@@ -43,7 +43,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.13.yaml b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.13.yaml
index e8fb936b2712f..2157011f85361 100644
--- a/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.13.yaml
+++ b/ci-operator/config/openshift/image-registry/openshift-image-registry-release-4.13.yaml
@@ -42,7 +42,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13.yaml b/ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13.yaml
index 45675da3641ad..53d36d348f84b 100644
--- a/ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13.yaml
+++ b/ci-operator/config/openshift/ingress-node-firewall/openshift-ingress-node-firewall-release-4.13.yaml
@@ -35,9 +35,9 @@ operator:
   bundles:
   - dockerfile_path: bundle.Dockerfile
   substitutions:
-  - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.13
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall:4.12
     with: pipeline:ingress-node-firewall
-  - pullspec: quay.io/openshift/origin-ingress-node-firewall-daemon:4.13
+  - pullspec: quay.io/openshift/origin-ingress-node-firewall-daemon:4.12
     with: pipeline:ingress-node-firewall
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 4aec09257e51c..de4d68d557780 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
index b10ee9fa890af..67c4ec792f3e7 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
index 09661035b6cfb..0484ae71befe0 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
index a2386df92bc45..86042c1dd6d24 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml
index 8844793605f7f..273f5a2586a62 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml
@@ -163,7 +163,7 @@ tests:
   commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(azure|baremetal|gcp|libvirt|openstack|ovirt|vsphere)/)
   steps:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
index 0c62397d74c91..79db6332255fa 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml
index 65831c6f60eb5..0631bdea46d24 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml
@@ -162,7 +162,7 @@ tests:
   commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(azure|baremetal|gcp|libvirt|openstack|ovirt|vsphere)/)
   steps:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml
index e3fbc45a5bdce..82577336e5d89 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml
index 72fe17a0d65ce..e48300870dbca 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml
index 6f03a9bf737c2..f40bf509e9b5b 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12.yaml b/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12.yaml
index bd3d4e003ac17..1daca3bad4bc0 100644
--- a/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12.yaml
+++ b/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12.yaml
@@ -40,10 +40,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13.yaml b/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13.yaml
index 737ab8224890f..cb85d24e97e07 100644
--- a/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13.yaml
+++ b/ci-operator/config/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13.yaml
@@ -39,10 +39,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.12.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.12.yaml
index 49e74903a59b2..26ac16e8120d0 100644
--- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.12.yaml
+++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.12.yaml
@@ -44,10 +44,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-virtualmedia
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.13.yaml b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.13.yaml
index dfccaa525fb69..ac8fba74c953b 100644
--- a/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.13.yaml
+++ b/ci-operator/config/openshift/ironic-image/openshift-ironic-image-release-4.13.yaml
@@ -43,10 +43,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-virtualmedia
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12.yaml
index 7fd1fa8d9b700..5e44d30abd13e 100644
--- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12.yaml
+++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12.yaml
@@ -37,10 +37,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 zz_generated_metadata:
   branch: release-4.12
diff --git a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13.yaml b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13.yaml
index 31a7e86bc52fb..e9e3a4570a032 100644
--- a/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13.yaml
+++ b/ci-operator/config/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13.yaml
@@ -36,10 +36,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 zz_generated_metadata:
   branch: release-4.13
diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12.yaml
index 40683fbc32e71..bd5618668fe98 100644
--- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12.yaml
+++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12.yaml
@@ -33,10 +33,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
diff --git a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13.yaml b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13.yaml
index 4bf11080b92fb..ae37de334a9ae 100644
--- a/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13.yaml
+++ b/ci-operator/config/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13.yaml
@@ -32,10 +32,13 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-bm
+  cluster: build05
   skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
   steps:
     cluster_profile: equinix-ocp-metal
+    env:
+      CLUSTERTYPE: baremetal
     workflow: baremetalds-e2e-ipv4
 - as: e2e-metal-ipi-serial-ipv4
   optional: true
diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12.yaml
index 36815af5580ff..734a69d1f7603 100644
--- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12.yaml
+++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12.yaml
@@ -47,7 +47,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13.yaml
index 437b7a0bd37ea..1e1d686255312 100644
--- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13.yaml
+++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13.yaml
@@ -46,7 +46,7 @@ tests:
   container:
     from: src
   optional: true
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12.yaml
index 3a0a23a42a1f4..186c4bd6c3d0f 100644
--- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12.yaml
+++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12.yaml
@@ -45,7 +45,7 @@ tests:
   commands: make test-unit
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13.yaml
index 53a62dc31d604..7f81140994ff3 100644
--- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13.yaml
+++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13.yaml
@@ -44,7 +44,7 @@ tests:
   commands: make test-unit
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-master.yaml b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-master.yaml
index a4e827bba5933..ebc3a95329a6b 100644
--- a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-master.yaml
+++ b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-master.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: "4.12"
-    namespace: ocp
-    tag: base
   ocp_4.12_base:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,27 +20,21 @@ build_root:
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
diff --git a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12.yaml b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12.yaml
index f4f43981bc97e..aad492682462e 100644
--- a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12.yaml
+++ b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: "4.12"
-    namespace: ocp
-    tag: base
   ocp_4.12_base:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,27 +20,21 @@ build_root:
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
@@ -100,6 +86,10 @@ tests:
   commands: make test/unit
   container:
     from: src
+- as: check-generate-bundle
+  commands: VERSION= make check-ocp-bundle
+  container:
+    from: src
 - as: e2e-handler-sdn-ipv4
   steps:
     cluster_profile: equinix-ocp-metal
diff --git a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13.yaml b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13.yaml
index d625a744468b6..cb417ea4f4582 100644
--- a/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13.yaml
+++ b/ci-operator/config/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13.yaml
@@ -7,18 +7,10 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_base:
-    name: "4.13"
-    namespace: ocp
-    tag: base
   ocp_4.12_base:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
@@ -28,27 +20,21 @@ build_root:
 images:
 - dockerfile_path: build/Dockerfile.openshift
   inputs:
-    ocp_4.11_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.11:base
     ocp_4.12_base:
       as:
       - registry.ci.openshift.org/ocp/4.12:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
     ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-handler
 - dockerfile_path: build/Dockerfile.operator.openshift
   inputs:
-    ocp_4.11_base:
+    ocp_4.12_base:
       as:
-      - registry.ci.openshift.org/ocp/4.11:base
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+      - registry.ci.openshift.org/ocp/4.12:base
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: kubernetes-nmstate-operator
 - dockerfile_literal: |
     FROM src
@@ -99,6 +85,10 @@ tests:
   commands: make test/unit
   container:
     from: src
+- as: check-generate-bundle
+  commands: VERSION= make check-ocp-bundle
+  container:
+    from: src
 - as: e2e-handler-sdn-ipv4
   steps:
     cluster_profile: equinix-ocp-metal
diff --git a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.8.yaml b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.8.yaml
index 0b8e027dd46a0..32e7b6d0af95c 100644
--- a/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift/local-storage-operator/openshift-local-storage-operator-release-4.8.yaml
@@ -7,10 +7,10 @@ base_images:
     name: "4.8"
     namespace: ocp
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.15-openshift-4.8:
-    name: builder
+  ocp_4.8_must-gather:
+    name: "4.8"
     namespace: ocp
-    tag: rhel-8-golang-1.15-openshift-4.8
+    tag: must-gather
   ocp_builder_rhel-8-golang-1.16-openshift-4.8:
     name: builder
     namespace: ocp
@@ -38,9 +38,9 @@ images:
 - dockerfile_path: Dockerfile.mustgather
   from: must_gather
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_4.8_must-gather:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/4.8:must-gather
   to: local-storage-mustgather
 promotion:
   name: "4.8"
diff --git a/ci-operator/config/openshift/loki/openshift-loki-main.yaml b/ci-operator/config/openshift/loki/openshift-loki-main.yaml
index 6fee688a63816..4d7bf84248c63 100644
--- a/ci-operator/config/openshift/loki/openshift-loki-main.yaml
+++ b/ci-operator/config/openshift/loki/openshift-loki-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: "4.11"
     namespace: ocp
     tag: base
-  builder:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
   lokistack-gateway:
     name: 5.y
     namespace: logging
@@ -42,10 +38,6 @@ images:
 - context_dir: operator
   dockerfile_path: Dockerfile
   from: base
-  inputs:
-    builder:
-      as:
-      - golang:1.18.4
   to: loki-operator
 operator:
   bundles:
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12.yaml
index 8abc76eea6833..b7a32107635a8 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12.yaml
@@ -62,12 +62,12 @@ tests:
   commands: IS_CONTAINER=TRUE make verify-crds-sync
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -119,7 +119,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-azure
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -139,7 +139,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13.yaml
index 41ce18e9fd78c..8e0119b4f9c64 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13.yaml
@@ -61,12 +61,12 @@ tests:
   commands: IS_CONTAINER=TRUE make verify-crds-sync
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
-- as: e2e-azure
+- as: e2e-azure-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -118,7 +118,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-azure
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
@@ -138,7 +138,7 @@ tests:
         requests:
           cpu: 100m
     workflow: ipi-gcp
-- as: e2e-metal-ipi
+- as: e2e-metal-ipi-sdn
   optional: true
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.12.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.12.yaml
index b648687b6c492..be9d50143d83a 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.12.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.12.yaml
@@ -62,6 +62,8 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
+    env:
+      SPOT_INSTANCES: "true"
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.13.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.13.yaml
index 7d662263770d2..2277ddf6da8e2 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.13.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.13.yaml
@@ -61,6 +61,8 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
+    env:
+      SPOT_INSTANCES: "true"
     workflow: openshift-e2e-aws
 - as: e2e-aws-operator
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
index fad00ff112efb..dde535a9df3a8 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
index aa5bf1cf978bf..730ba538a5f00 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml
index a067e5a54e5a7..367bc2ee5c877 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml
index 81bb150ce3d32..82562ea515430 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml
index 643588fbae22d..f96c8b48025f2 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13__okd.yaml
index a8eb8b1064cd9..349ff8dcb8bf2 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13__okd.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13__okd.yaml
@@ -21,7 +21,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: machine-config-operator
 promotion:
-  disabled: true
   name: "4.13"
   namespace: origin
 releases:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7.yaml
index 84388084ee326..a5fc7f36bd912 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.8.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.8.yaml
index aca16c2e3976d..555383a115b66 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.8.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.8.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml
index 544bbb62b6625..96cef8a9554d2 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml
@@ -1,8 +1,4 @@
 base_images:
-  assisted-image-service:
-    name: ocm-2.7
-    namespace: edge-infrastructure
-    tag: assisted-image-service
   assisted-installer:
     name: ocm-2.7
     namespace: edge-infrastructure
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
index 66d45c0a334fc..7b427d5864b5b 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.12"
     namespace: ocp
     tag: installer
@@ -20,9 +20,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
index cee72efe57031..e321c14ce2347 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
@@ -3,9 +3,9 @@ base_images:
     name: "4.12"
     namespace: origin
     tag: base
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.12"
-    namespace: origin
+    namespace: ocp
     tag: installer
 build_root:
   from_repository: true
@@ -16,9 +16,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12.yaml
index 86c9cc4faa2da..cc853644a19f4 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.12"
     namespace: ocp
     tag: installer
@@ -20,9 +20,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd.yaml
index a930023750f7a..cf24f01dc5498 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.12__okd.yaml
@@ -3,9 +3,9 @@ base_images:
     name: "4.12"
     namespace: origin
     tag: base
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.12"
-    namespace: origin
+    namespace: ocp
     tag: installer
 build_root:
   from_repository: true
@@ -16,9 +16,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13.yaml
index 8066fca83736d..dc1ccb9e67f4d 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13.yaml
@@ -7,7 +7,7 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.13"
     namespace: ocp
     tag: installer
@@ -20,9 +20,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd.yaml
index a74b5bcfeff7f..b6dd8cdde59f0 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.13__okd.yaml
@@ -3,9 +3,9 @@ base_images:
     name: "4.13"
     namespace: origin
     tag: base
-  ocp_4.11_installer:
+  ocp_4.12_installer:
     name: "4.13"
-    namespace: origin
+    namespace: ocp
     tag: installer
 build_root:
   from_repository: true
@@ -16,9 +16,9 @@ images:
   dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_4.11_installer:
+    ocp_4.12_installer:
       as:
-      - registry.ci.openshift.org/ocp/4.11:installer
+      - registry.ci.openshift.org/ocp/4.12:installer
   to: machine-os-images
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml b/ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml
index 2f74fad191aec..c7901340cd7a0 100644
--- a/ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml
+++ b/ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi
     namespace: ocp
     tag: "8"
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+  openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
+    name: release
+    namespace: openshift
+    tag: rhel-8-release-golang-1.17-openshift-4.10
 build_root:
   image_stream_tag:
     name: release
@@ -16,9 +16,9 @@ images:
 - dockerfile_path: build/Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.17-openshift-4.10
   to: managed-cluster-validating-webhooks
 resources:
   '*':
diff --git a/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.12.yaml b/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.12.yaml
index 7631a40de1443..2633a045a3b2f 100644
--- a/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.12.yaml
+++ b/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.12.yaml
@@ -48,7 +48,7 @@ resources:
       memory: 200Mi
 test_binary_build_commands: '"make build GO_BUILD_FLAGS:=''-race'' --warn-undefined-variables"'
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.13.yaml b/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.13.yaml
index 231fd35c964ae..6ce06e0e713a7 100644
--- a/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.13.yaml
+++ b/ci-operator/config/openshift/network-tools/openshift-network-tools-release-4.13.yaml
@@ -47,7 +47,7 @@ resources:
       memory: 200Mi
 test_binary_build_commands: '"make build GO_BUILD_FLAGS:=''-race'' --warn-undefined-variables"'
 tests:
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
index 3c41ff6e1f36d..2578c2f72d21d 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
@@ -11,10 +11,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: "4.12"
     namespace: ocp
@@ -26,9 +26,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -36,16 +36,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -54,9 +54,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.12.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.12.yaml
index 3c7c1852ce015..4a3d332f271d9 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.12.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.12.yaml
@@ -11,10 +11,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: "4.12"
     namespace: ocp
@@ -26,9 +26,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -36,16 +36,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -54,9 +54,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
@@ -130,7 +130,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.13.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.13.yaml
index d03ce122f102e..1b9c182fcb11f 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.13.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.13.yaml
@@ -11,10 +11,10 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: must-gather
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
   tests-base:
     name: "4.13"
     namespace: ocp
@@ -26,9 +26,9 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli
 - context_dir: images/tools
   from: cli
@@ -36,16 +36,16 @@ images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: tests
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: must-gather-base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: must-gather
 - context_dir: images/deployer
   dockerfile_path: Dockerfile.rhel
@@ -54,9 +54,9 @@ images:
 - dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: cli-artifacts
 - context_dir: images/recycler/
   dockerfile_path: Dockerfile.rhel
@@ -129,7 +129,7 @@ tests:
     make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
   container:
     from: test-bin
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml
index eeab3ca6afbd0..1049aa92fa7bc 100644
--- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml
+++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml
@@ -60,7 +60,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml
index fcac3983b293d..70f1539952508 100644
--- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml
+++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml
@@ -1,6 +1,6 @@
 base_images:
   artifacts:
-    name: "4.12"
+    name: "4.13"
     namespace: origin
     tag: artifacts
 build_root:
@@ -59,7 +59,7 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12.yaml
index 0e12fb3b758e1..bed9841ad1abe 100644
--- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12.yaml
+++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12.yaml
@@ -51,7 +51,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13.yaml
index 982f12f8dc8ef..2a6881f1766d2 100644
--- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13.yaml
+++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13.yaml
@@ -50,7 +50,7 @@ tests:
   container:
     from: test-bin
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: e2e-aws
+- as: e2e-aws-ovn
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12.yaml
index db3081f046b6a..87a1671427c5d 100644
--- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12.yaml
+++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make doccheck
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13.yaml b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13.yaml
index 33feb5f3aca06..ea366a087f0dc 100644
--- a/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13.yaml
+++ b/ci-operator/config/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make doccheck
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml
index 984592945b875..eebbbdae68a1f 100644
--- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml
+++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make verify
   container:
     from: ci-image
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13.yaml
index 1e9db3e4129e3..ad873c2fd9961 100644
--- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13.yaml
+++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make verify
   container:
     from: ci-image
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml
index 00f401cd46441..4f6468d678e4c 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml
@@ -58,10 +58,6 @@ releases:
       include_built_images: true
       name: "4.12"
       namespace: ocp
-  previous:
-    integration:
-      name: "4.12"
-      namespace: ocp
 resources:
   '*':
     requests:
@@ -186,8 +182,6 @@ tests:
   optional: true
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     workflow: openshift-upgrade-gcp-ovn-rt
 - as: e2e-gcp-csi
   optional: true
diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml
index f6bc455c1714d..89e909fe354b8 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml
@@ -57,10 +57,6 @@ releases:
       include_built_images: true
       name: "4.13"
       namespace: ocp
-  previous:
-    integration:
-      name: "4.13"
-      namespace: ocp
 resources:
   '*':
     requests:
@@ -96,7 +92,7 @@ tests:
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-loki
-- as: e2e-gcp
+- as: e2e-gcp-ovn
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-e2e-gcp-loki
@@ -123,7 +119,7 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-cmd
+- as: e2e-agnostic-ovn-cmd
   optional: true
   steps:
     cluster_profile: azure4
@@ -177,7 +173,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/image-registry
     workflow: openshift-e2e-aws-image-registry
-- as: e2e-gcp-upgrade
+- as: e2e-gcp-ovn-upgrade
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
     workflow: openshift-upgrade-gcp
@@ -185,8 +181,6 @@ tests:
   optional: true
   steps:
     cluster_profile: gcp-openshift-gce-devel-ci-2
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:previous
     workflow: openshift-upgrade-gcp-ovn-rt
 - as: e2e-gcp-csi
   optional: true
@@ -204,7 +198,7 @@ tests:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: abort-at=100
     workflow: openshift-upgrade-aws
-- as: e2e-aws-serial
+- as: e2e-aws-ovn-serial
   steps:
     cluster_profile: aws-2
     env:
@@ -227,7 +221,7 @@ tests:
     env:
       TEST_SUITE: openshift/conformance/parallel
     workflow: openshift-e2e-vsphere-upi
-- as: e2e-aws-fips
+- as: e2e-aws-ovn-fips
   steps:
     cluster_profile: aws-2
     env:
@@ -277,14 +271,14 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     workflow: baremetalds-e2e-serial-ovn-ipv6
-- as: e2e-aws-single-node
+- as: e2e-aws-ovn-single-node
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-serial
+- as: e2e-aws-ovn-single-node-serial
   optional: true
   steps:
     cluster_profile: aws-2
@@ -292,7 +286,7 @@ tests:
       BASE_DOMAIN: aws-2.ci.openshift.org
       TEST_SUITE: openshift/conformance/serial
     workflow: openshift-e2e-aws-single-node
-- as: e2e-aws-single-node-upgrade
+- as: e2e-aws-ovn-single-node-upgrade
   optional: true
   steps:
     cluster_profile: aws-2
@@ -323,7 +317,7 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-csi-migration
-- as: e2e-aws-cgroupsv2
+- as: e2e-aws-ovn-cgroupsv2
   optional: true
   steps:
     cluster_profile: aws
diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.10.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.10.yaml
index 58c972ad1f5fd..4ca10650f92e5 100644
--- a/ci-operator/config/openshift/os/openshift-os-release-4.10.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-release-4.10.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_4.10:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.10"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_4.10:
+    coreos_coreos-assembler_latest:
       as:
-      - registry.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
 promotion:
   excluded_images:
diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.7.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.7.yaml
index 8b26585423152..2dece4caaf053 100644
--- a/ci-operator/config/openshift/os/openshift-os-release-4.7.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-release-4.7.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_47:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.7"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_47:
+    coreos_coreos-assembler_latest:
       as:
-      - registry.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
 resources:
   '*':
diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml
index 91cc7947fdc60..da48549fbc4b5 100644
--- a/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_48:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.8"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_48:
+    coreos_coreos-assembler_latest:
       as:
-      - registry.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
 resources:
   '*':
diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.9.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.9.yaml
index d2204cc3ed890..3f6a65f877586 100644
--- a/ci-operator/config/openshift/os/openshift-os-release-4.9.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-release-4.9.yaml
@@ -1,8 +1,8 @@
 base_images:
-  coreos_coreos-assembler_4.9:
+  coreos_coreos-assembler_latest:
     name: coreos-assembler
     namespace: coreos
-    tag: "4.9"
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/Dockerfile
   inputs:
-    coreos_coreos-assembler_4.9:
+    coreos_coreos-assembler_latest:
       as:
-      - registry.ci.openshift.org/coreos/coreos-assembler:latest
+      - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-test-qemu-img
 promotion:
   excluded_images:
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
index 82e734d706bcd..849e9d0dfc783 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml
@@ -24,8 +24,7 @@ images:
 - dockerfile_path: Dockerfile.base
   from: base
   to: ovn-kubernetes-base
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_4.12_cli:
       as:
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.12.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.12.yaml
index c9572aaaf768f..9d044f5955be9 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.12.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.12.yaml
@@ -24,8 +24,7 @@ images:
 - dockerfile_path: Dockerfile.base
   from: base
   to: ovn-kubernetes-base
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_4.12_cli:
       as:
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.13.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.13.yaml
index d808def3f8633..51b635a3afe69 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.13.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.13.yaml
@@ -24,8 +24,7 @@ images:
 - dockerfile_path: Dockerfile.base
   from: base
   to: ovn-kubernetes-base
-- dockerfile_path: Dockerfile
-  from: base
+- from: base
   inputs:
     ocp_4.12_cli:
       as:
diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12.yaml
index d9f97a6654940..59fcfc90b9dae 100644
--- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12.yaml
+++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12.yaml
@@ -48,7 +48,7 @@ tests:
   commands: make build && make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13.yaml
index db2c6d970c60e..b143414c11565 100644
--- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13.yaml
+++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13.yaml
@@ -47,7 +47,7 @@ tests:
   commands: make build && make test
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.12.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.12.yaml
index c441ea8522a1b..2ade40f2a835b 100644
--- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.12.yaml
@@ -47,7 +47,7 @@ tests:
   commands: make fmt
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.13.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.13.yaml
index dc76ca3906b4f..aa42f7731829e 100644
--- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.13.yaml
@@ -46,7 +46,7 @@ tests:
   commands: make fmt
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12.yaml b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12.yaml
new file mode 100644
index 0000000000000..c1da92582bf0f
--- /dev/null
+++ b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12.yaml
@@ -0,0 +1,72 @@
+base_images:
+  base:
+    name: "4.12"
+    namespace: ocp
+    tag: base
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+binary_build_commands: make build --warn-undefined-variables
+build_root:
+  from_repository: true
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: openshift-route-controller-manager
+promotion:
+  disabled: true
+  name: "4.12"
+  namespace: ocp
+releases:
+  initial:
+    integration:
+      name: "4.12"
+      namespace: ocp
+  latest:
+    integration:
+      include_built_images: true
+      name: "4.12"
+      namespace: ocp
+resources:
+  '*':
+    requests:
+      cpu: "3"
+      memory: 6Gi
+test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
+tests:
+- as: verify
+  commands: |
+    make verify -k --warn-undefined-variables
+  container:
+    from: bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: unit
+  commands: |
+    make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+  container:
+    from: test-bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-upgrade-aws
+- as: e2e-gcp
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.12
+  org: openshift
+  repo: route-controller-manager
diff --git a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13.yaml b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13.yaml
new file mode 100644
index 0000000000000..437c297caf3fe
--- /dev/null
+++ b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13.yaml
@@ -0,0 +1,71 @@
+base_images:
+  base:
+    name: "4.13"
+    namespace: ocp
+    tag: base
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.18-openshift-4.12
+binary_build_commands: make build --warn-undefined-variables
+build_root:
+  from_repository: true
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  inputs:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
+  to: openshift-route-controller-manager
+promotion:
+  name: "4.13"
+  namespace: ocp
+releases:
+  initial:
+    integration:
+      name: "4.13"
+      namespace: ocp
+  latest:
+    integration:
+      include_built_images: true
+      name: "4.13"
+      namespace: ocp
+resources:
+  '*':
+    requests:
+      cpu: "3"
+      memory: 6Gi
+test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
+tests:
+- as: verify
+  commands: |
+    make verify -k --warn-undefined-variables
+  container:
+    from: bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: unit
+  commands: |
+    make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+  container:
+    from: test-bin
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-aws-upgrade
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-upgrade-aws
+- as: e2e-gcp
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.13
+  org: openshift
+  repo: route-controller-manager
diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-master.yaml
index 5f45014da892e..2c80eb43a5302 100644
--- a/ci-operator/config/openshift/router/openshift-router-master.yaml
+++ b/ci-operator/config/openshift/router/openshift-router-master.yaml
@@ -7,19 +7,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.12.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.12.yaml
index 56361f3f22049..5079ccc2ba4ef 100644
--- a/ci-operator/config/openshift/router/openshift-router-release-4.12.yaml
+++ b/ci-operator/config/openshift/router/openshift-router-release-4.12.yaml
@@ -7,19 +7,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift/router/openshift-router-release-4.13.yaml b/ci-operator/config/openshift/router/openshift-router-release-4.13.yaml
index b293f5bc378af..5aa84412d3eb9 100644
--- a/ci-operator/config/openshift/router/openshift-router-release-4.13.yaml
+++ b/ci-operator/config/openshift/router/openshift-router-release-4.13.yaml
@@ -7,19 +7,19 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: images/router/base/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   optional: true
   to: haproxy-router-base
 - dockerfile_path: images/router/haproxy/Dockerfile.rhel8
diff --git a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.13.yaml b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.13.yaml
index 0ea4c7a72b24b..215cb996b94f4 100644
--- a/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.13.yaml
+++ b/ci-operator/config/openshift/runtime-utils/openshift-runtime-utils-release-4.13.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 promotion:
   name: "4.13"
   namespace: ocp
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
index ee9c31956f8fd..7314e3a62cb9f 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.12.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.12.yaml
index 81df9448edaa3..4804fd676f3bb 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.12.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.13.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.13.yaml
index e85be0417bdb5..9c4b989bc7ee6 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.13.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.10
+    tag: rhel-8-golang-1.18-openshift-4.11
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -14,9 +14,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: service-ca-operator
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
index 9fe4967754de1..a7a3768eef0e8 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.12.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.12.yaml
index cf3b20a0c26a6..11b49278fc3e0 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.12.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.12.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.13.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.13.yaml
index d6491f8388bfb..7f7c498d9f209 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.13.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.13.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.16-openshift-4.9
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.16-openshift-4.9:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: sriov-cni
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.11.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.11.yaml
index efe59a3758d54..caae17346053f 100644
--- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.11.yaml
+++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.11.yaml
@@ -3,10 +3,10 @@ base_images:
     name: "4.11"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.17-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.11
   openstack-installer:
     name: "4.11"
     namespace: ocp
@@ -33,23 +33,23 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.17-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
   to: sriov-network-webhook
 operator:
   bundles:
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml
index 713de28af2dde..1f68bf6aa2223 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml
@@ -53,7 +53,7 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml
index 8dddfb17060fc..d68119c6c1251 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml
@@ -52,7 +52,7 @@ tests:
   commands: make test-integration
   container:
     from: src
-- as: e2e-aws
+- as: e2e-aws-ovn
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
diff --git a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-master.yaml b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-master.yaml
index f6768e092943f..d5a8b4b28c7dd 100644
--- a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-master.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-master.yaml
@@ -1,16 +1,16 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.11.yaml b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.11.yaml
index 6848e72972ede..4363d192919f5 100644
--- a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.11.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.11.yaml
@@ -1,16 +1,16 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: "4.11"
diff --git a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.12.yaml b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.12.yaml
index 7574f24bf8776..23e13acf77f73 100644
--- a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.12.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.12.yaml
@@ -1,16 +1,16 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.13.yaml b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.13.yaml
index 7a489d6d0f3e7..c2daea1bcbfde 100644
--- a/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.13.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-bootstrapper/openshift-windows-machine-config-bootstrapper-release-4.13.yaml
@@ -1,16 +1,16 @@
 base_images:
-  openshift_release_golang-1.17:
+  openshift_release_golang-1.18:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.tools
   inputs:
-    openshift_release_golang-1.17:
+    openshift_release_golang-1.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.17
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-bootstrapper-tests
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml
index 682e765036484..191412af859f1 100644
--- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml
@@ -1,8 +1,12 @@
 base_images:
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.17-openshift-4.10:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.17-openshift-4.10
+  openshift_release_golang-1.18:
+    name: release
+    namespace: openshift
+    tag: golang-1.18
 binary_build_commands: make build
 build_root:
   from_repository: true
@@ -10,9 +14,12 @@ build_root:
 images:
 - dockerfile_path: build/Dockerfile.ci
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.17-openshift-4.10:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
+    openshift_release_golang-1.18:
+      as:
+      - registry.ci.openshift.org/openshift/release:golang-1.18
   to: windows-machine-config-operator-test
 releases:
   latest:
diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml
index dc022211427bc..0f78a9a2d3213 100644
--- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml
@@ -117,6 +117,13 @@ tests:
     test:
     - ref: windows-e2e-operator-test-with-custom-vxlan-port
     workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
+- as: vsphere-e2e-ccm-install
+  optional: true
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: openshift-e2e-vsphere-ccm-ovn-hybrid-install
 - as: aws-e2e-upgrade
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml
index a3a79f37cb5d0..56e26b9b7afa1 100644
--- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml
+++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml
@@ -116,6 +116,13 @@ tests:
     test:
     - ref: windows-e2e-operator-test-with-custom-vxlan-port
     workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
+- as: vsphere-e2e-ccm-install
+  optional: true
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: openshift-e2e-vsphere-ccm-ovn-hybrid-install
 - as: aws-e2e-upgrade
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml
index 47e97b55680df..27b7f61606e9e 100644
--- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml
+++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: operator-marketplace
 promotion:
   name: "4.12"
diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml
index 83d24982c78ab..ddcc375d5b839 100644
--- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml
+++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.12.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: operator-marketplace
 promotion:
   disabled: true
diff --git a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.13.yaml b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.13.yaml
index 56d4fab0e451a..183b747203a53 100644
--- a/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.13.yaml
+++ b/ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-release-4.13.yaml
@@ -3,19 +3,19 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: base
-  ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+  ocp_builder_rhel-8-golang-1.18-openshift-4.12:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.18-openshift-4.11
+    tag: rhel-8-golang-1.18-openshift-4.12
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.18-openshift-4.11:
+    ocp_builder_rhel-8-golang-1.18-openshift-4.12:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
   to: operator-marketplace
 promotion:
   name: "4.13"
diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml
index 4db3e65e3e155..86e978e6ae722 100644
--- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml
+++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml
@@ -3,7 +3,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.17
+    tag: golang-1.18
 promotion:
   name: "4.13"
   namespace: ocp
diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml
index 4fee599c71aa5..681045f490bd4 100644
--- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml
+++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml
@@ -7,10 +7,6 @@ base_images:
     name: automation-flavors
     namespace: stackrox
     tag: eks-0.3.1
-  golang-1.17.12:
-    name: golang
-    namespace: stackrox
-    tag: 1.17.12
   osd:
     name: automation-flavors
     namespace: stackrox
@@ -89,9 +85,6 @@ images:
   to: docs
 - dockerfile_path: operator/build/Dockerfile.gen
   inputs:
-    golang-1.17.12:
-      as:
-      - golang:1.17.12
     operator-artifacts:
       paths:
       - destination_dir: .
diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml
index 6bb3f7dd60b8f..13d122cab5964 100644
--- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml
+++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-nightlies.yaml
@@ -7,10 +7,6 @@ base_images:
     name: automation-flavors
     namespace: stackrox
     tag: eks-0.3.1
-  golang-1.17.12:
-    name: golang
-    namespace: stackrox
-    tag: 1.17.12
   osd:
     name: automation-flavors
     namespace: stackrox
@@ -89,9 +85,6 @@ images:
   to: docs
 - dockerfile_path: operator/build/Dockerfile.gen
   inputs:
-    golang-1.17.12:
-      as:
-      - golang:1.17.12
     operator-artifacts:
       paths:
       - destination_dir: .
diff --git a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-1.0.yaml b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-1.0.yaml
index 9b65694745892..a7ecd97b22ef2 100644
--- a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-1.0.yaml
+++ b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-1.0.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.0.yaml b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.0.yaml
index 7a1cd0c4665c4..ff17df2835940 100644
--- a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.0.yaml
+++ b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.0.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.1.yaml b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.1.yaml
index 50af9c5738870..7aceb879affe6 100644
--- a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.1.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.2.yaml b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.2.yaml
index f67f8369f1c82..00fa6e045ae3d 100644
--- a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.2.yaml
+++ b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-backplane-2.2.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-main.yaml b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-main.yaml
index 97b06fd53be32..f47850000a8ac 100644
--- a/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-main.yaml
+++ b/ci-operator/config/stolostron/backplane-operator/stolostron-backplane-operator-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-main.yaml b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-main.yaml
index f9fbb6f04f670..0ef5958bc4d2e 100644
--- a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-main.yaml
+++ b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.4.yaml b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.4.yaml
index 0c0a82196a4e7..8bf3730922b02 100644
--- a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.4.yaml
+++ b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.4.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.5.yaml b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.5.yaml
index fab2791a379ee..dabcee7262c71 100644
--- a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.5.yaml
+++ b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.5.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.6.yaml b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.6.yaml
index 514ee22cd75b4..b0ff8208617bd 100644
--- a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.6.yaml
+++ b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.7.yaml b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.7.yaml
index 8ae4ee4a808da..e6f2acd70baad 100644
--- a/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.7.yaml
+++ b/ci-operator/config/stolostron/cluster-backup-operator/stolostron-cluster-backup-operator-release-2.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-backplane-2.1.yaml b/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-backplane-2.1.yaml
index 5da92e7051638..c064f21a5dcf8 100644
--- a/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-backplane-2.1.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-main.yaml b/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-main.yaml
index a3e29b7e8d6bb..4548e22314214 100644
--- a/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-main.yaml
+++ b/ci-operator/config/stolostron/cluster-curator-controller/stolostron-cluster-curator-controller-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-main.yaml b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-main.yaml
index 1f3fbb08f00d1..f07fb256ad68a 100644
--- a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-main.yaml
+++ b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.6.yaml b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.6.yaml
index ef891dd70a997..0981363aa3aed 100644
--- a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.6.yaml
+++ b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.7.yaml b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.7.yaml
index 234dd46c20f91..d11a5d4603ae4 100644
--- a/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.7.yaml
+++ b/ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-proxy-addon/stolostron-cluster-proxy-addon-release-2.6.yaml b/ci-operator/config/stolostron/cluster-proxy-addon/stolostron-cluster-proxy-addon-release-2.6.yaml
index 917fb51eebc21..52167fb4c7cbc 100644
--- a/ci-operator/config/stolostron/cluster-proxy-addon/stolostron-cluster-proxy-addon-release-2.6.yaml
+++ b/ci-operator/config/stolostron/cluster-proxy-addon/stolostron-cluster-proxy-addon-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/cluster-proxy/stolostron-cluster-proxy-release-2.6.yaml b/ci-operator/config/stolostron/cluster-proxy/stolostron-cluster-proxy-release-2.6.yaml
index 399533f9ad001..b4ad13160c3c3 100644
--- a/ci-operator/config/stolostron/cluster-proxy/stolostron-cluster-proxy-release-2.6.yaml
+++ b/ci-operator/config/stolostron/cluster-proxy/stolostron-cluster-proxy-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-backplane-2.1.yaml b/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-backplane-2.1.yaml
index de4c20870cce1..72ae965e65f6c 100644
--- a/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-backplane-2.1.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-main.yaml b/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-main.yaml
index 8dd3f6cbec28b..2d4a7cc6db23f 100644
--- a/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-main.yaml
+++ b/ci-operator/config/stolostron/clusterclaims-controller/stolostron-clusterclaims-controller-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.1.yaml b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.1.yaml
index ac5dfbadc8334..d7baad1e50f4b 100644
--- a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.1.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.2.yaml b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.2.yaml
index 7ce91f2964a4a..e238918fd2f17 100644
--- a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.2.yaml
+++ b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-backplane-2.2.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-main.yaml b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-main.yaml
index ab48f594f1c0c..d17bf3a927ac9 100644
--- a/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-main.yaml
+++ b/ci-operator/config/stolostron/clusterlifecycle-state-metrics/stolostron-clusterlifecycle-state-metrics-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/console/stolostron-console-main.yaml b/ci-operator/config/stolostron/console/stolostron-console-main.yaml
index 38a5671907f0c..f45476695ae6a 100644
--- a/ci-operator/config/stolostron/console/stolostron-console-main.yaml
+++ b/ci-operator/config/stolostron/console/stolostron-console-main.yaml
@@ -3,18 +3,10 @@ base_images:
     name: builder
     namespace: stolostron
     tag: nodejs14-linux
-  stolostron_builder_nodejs16-linux:
-    name: builder
-    namespace: stolostron
-    tag: nodejs16-linux
   stolostron_common-nodejs-parent_nodejs-14:
     name: common-nodejs-parent
     namespace: stolostron
     tag: nodejs-14
-  stolostron_common-nodejs-parent_nodejs-16:
-    name: common-nodejs-parent
-    namespace: stolostron
-    tag: nodejs-16
 binary_build_commands: make -f Makefile.prow install && make -f Makefile.prow build
 build_root:
   image_stream_tag:
@@ -27,30 +19,18 @@ images:
     stolostron_builder_nodejs14-linux:
       as:
       - registry.ci.openshift.org/stolostron/builder:nodejs14-linux
-    stolostron_builder_nodejs16-linux:
-      as:
-      - registry.ci.openshift.org/stolostron/builder:nodejs16-linux
     stolostron_common-nodejs-parent_nodejs-14:
       as:
       - registry.ci.openshift.org/stolostron/common-nodejs-parent:nodejs-14
-    stolostron_common-nodejs-parent_nodejs-16:
-      as:
-      - registry.ci.openshift.org/stolostron/common-nodejs-parent:nodejs-16
   to: console
 - dockerfile_path: Dockerfile.mce.prow
   inputs:
     stolostron_builder_nodejs14-linux:
       as:
       - registry.ci.openshift.org/stolostron/builder:nodejs14-linux
-    stolostron_builder_nodejs16-linux:
-      as:
-      - registry.ci.openshift.org/stolostron/builder:nodejs16-linux
     stolostron_common-nodejs-parent_nodejs-14:
       as:
       - registry.ci.openshift.org/stolostron/common-nodejs-parent:nodejs-14
-    stolostron_common-nodejs-parent_nodejs-16:
-      as:
-      - registry.ci.openshift.org/stolostron/common-nodejs-parent:nodejs-16
   to: console-mce
 resources:
   '*':
diff --git a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.0.yaml b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.0.yaml
index 856577dd9e2d2..b08f20e0dec97 100644
--- a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.0.yaml
+++ b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.0.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.1.yaml b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.1.yaml
index b4ad737418932..5191fca373e12 100644
--- a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.1.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.2.yaml b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.2.yaml
index 8a2e612ec3e40..3d6245a012f2c 100644
--- a/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.2.yaml
+++ b/ci-operator/config/stolostron/discovery/stolostron-discovery-backplane-2.2.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/discovery/stolostron-discovery-main.yaml b/ci-operator/config/stolostron/discovery/stolostron-discovery-main.yaml
index 225d83146e871..0799a8fcbfca2 100644
--- a/ci-operator/config/stolostron/discovery/stolostron-discovery-main.yaml
+++ b/ci-operator/config/stolostron/discovery/stolostron-discovery-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/discovery/stolostron-discovery-release-2.4.yaml b/ci-operator/config/stolostron/discovery/stolostron-discovery-release-2.4.yaml
index 9c0925d65ae3b..10a2103f231cb 100644
--- a/ci-operator/config/stolostron/discovery/stolostron-discovery-release-2.4.yaml
+++ b/ci-operator/config/stolostron/discovery/stolostron-discovery-release-2.4.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/hypershift-addon-operator/stolostron-hypershift-addon-operator-backplane-2.1.yaml b/ci-operator/config/stolostron/hypershift-addon-operator/stolostron-hypershift-addon-operator-backplane-2.1.yaml
index 5e3f683d51ece..385af652ea4b0 100644
--- a/ci-operator/config/stolostron/hypershift-addon-operator/stolostron-hypershift-addon-operator-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/hypershift-addon-operator/stolostron-hypershift-addon-operator-backplane-2.1.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.18-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/hypershift-deployment-controller/stolostron-hypershift-deployment-controller-backplane-2.1.yaml b/ci-operator/config/stolostron/hypershift-deployment-controller/stolostron-hypershift-deployment-controller-backplane-2.1.yaml
index 789dcf5b170a8..19c393d087d98 100644
--- a/ci-operator/config/stolostron/hypershift-deployment-controller/stolostron-hypershift-deployment-controller-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/hypershift-deployment-controller/stolostron-hypershift-deployment-controller-backplane-2.1.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.18-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-main.yaml b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-main.yaml
index 3d7505fdb174d..b75c9570d5786 100644
--- a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-main.yaml
+++ b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.6.yaml b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.6.yaml
index 918ffb3f6eb2c..cfe8290ef3071 100644
--- a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.6.yaml
+++ b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.7.yaml b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.7.yaml
index 3e6589f2e6b3b..0cca3b8f2f6ee 100644
--- a/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.7.yaml
+++ b/ci-operator/config/stolostron/klusterlet-addon-controller/stolostron-klusterlet-addon-controller-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/maintenance-window/stolostron-maintenance-window-release-2.6.yaml b/ci-operator/config/stolostron/maintenance-window/stolostron-maintenance-window-release-2.6.yaml
index c27fa68c26f5c..c150d797e1726 100644
--- a/ci-operator/config/stolostron/maintenance-window/stolostron-maintenance-window-release-2.6.yaml
+++ b/ci-operator/config/stolostron/maintenance-window/stolostron-maintenance-window-release-2.6.yaml
@@ -1,8 +1,3 @@
-base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 build_root:
   image_stream_tag:
     name: builder
diff --git a/ci-operator/config/stolostron/managed-serviceaccount/stolostron-managed-serviceaccount-backplane-2.0.yaml b/ci-operator/config/stolostron/managed-serviceaccount/stolostron-managed-serviceaccount-backplane-2.0.yaml
index 1008f6472f936..da4c2068b63f1 100644
--- a/ci-operator/config/stolostron/managed-serviceaccount/stolostron-managed-serviceaccount-backplane-2.0.yaml
+++ b/ci-operator/config/stolostron/managed-serviceaccount/stolostron-managed-serviceaccount-backplane-2.0.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.1.yaml b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.1.yaml
index 05de832db90d8..d63af864598c8 100644
--- a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.1.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-main.yaml b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-main.yaml
index 35dcefde929d7..e4e726754ee94 100644
--- a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-main.yaml
+++ b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-main.yaml b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-main.yaml
index ab376aba112cc..e263d335fdbfa 100644
--- a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-main.yaml
+++ b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: repo-brancher
     namespace: ci
     tag: latest
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.6.yaml b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.6.yaml
index 3e214022d99c5..93082cdaece8c 100644
--- a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.7.yaml b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.7.yaml
index aed0eb499312a..f3f5864a5e364 100644
--- a/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multicloud-integrations/stolostron-multicloud-integrations-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-main.yaml b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-main.yaml
index db4b64fab9ce3..f8185527c2a85 100644
--- a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-main.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: repo-brancher
     namespace: ci
     tag: latest
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.6.yaml b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.6.yaml
index 015b68f6e4be0..840a5aa75ea99 100644
--- a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.7.yaml b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.7.yaml
index c39e1fb8a615d..d14420e96024e 100644
--- a/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-application/stolostron-multicloud-operators-application-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-main.yaml b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-main.yaml
index c65ed5811145e..bd504142593f9 100644
--- a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-main.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: repo-brancher
     namespace: ci
     tag: latest
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.6.yaml b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.6.yaml
index dc3bcf05c1589..a34b69588d9b6 100644
--- a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.7.yaml b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.7.yaml
index 00a9dcca0b393..b7297e3a834e8 100644
--- a/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-channel/stolostron-multicloud-operators-channel-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml
index e217476ee6219..4b1901fd52b65 100644
--- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-main.yaml b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-main.yaml
index 97297910614c8..2123d68dea25c 100644
--- a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-main.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: repo-brancher
     namespace: ci
     tag: latest
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.6.yaml b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.6.yaml
index 250fb99959e1a..8e2dab10bded8 100644
--- a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.7.yaml b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.7.yaml
index 7040d408f4e58..e993d1dc71d4c 100644
--- a/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-subscription/stolostron-multicloud-operators-subscription-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml b/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
index 828ab154f417e..4cb326068ecbb 100644
--- a/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
+++ b/ci-operator/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-main.yaml b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-main.yaml
index 924227344f975..d0bed7937dc94 100644
--- a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-main.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.4.yaml b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.4.yaml
index 54027cd742a49..fea1426aeffc1 100644
--- a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.4.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.4.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.5.yaml b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.5.yaml
index 9ae120ce126eb..c12929aa72946 100644
--- a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.5.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.5.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.6.yaml b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.6.yaml
index 8f328301d344f..f814f46d1a6ac 100644
--- a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.7.yaml b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.7.yaml
index ec2fda54c241f..30283707080e2 100644
--- a/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-operator/stolostron-multiclusterhub-operator-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-main.yaml b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-main.yaml
index 84de5afbf3f57..fd28ecabebf8a 100644
--- a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-main.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.4.yaml b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.4.yaml
index e8d0fdec6a380..a362237fdb103 100644
--- a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.4.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.4.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.5.yaml b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.5.yaml
index ba56f2ce9d7a5..a0f333ec428de 100644
--- a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.5.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.5.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.6.yaml b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.6.yaml
index ca6ef6466a51d..637debd91a096 100644
--- a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.6.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.6.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.7.yaml b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.7.yaml
index b9dfedf647663..7586064af32cf 100644
--- a/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.7.yaml
+++ b/ci-operator/config/stolostron/multiclusterhub-repo/stolostron-multiclusterhub-repo-release-2.7.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/placement/stolostron-placement-backplane-2.0.yaml b/ci-operator/config/stolostron/placement/stolostron-placement-backplane-2.0.yaml
index c5900b5e915f5..036952714b17c 100644
--- a/ci-operator/config/stolostron/placement/stolostron-placement-backplane-2.0.yaml
+++ b/ci-operator/config/stolostron/placement/stolostron-placement-backplane-2.0.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.1.yaml b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.1.yaml
index ff1a578699b11..2e123b2256ae6 100644
--- a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.1.yaml
+++ b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.1.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-main.yaml b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-main.yaml
index 70ee25b67833a..5c82a078da389 100644
--- a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-main.yaml
+++ b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.3.yaml b/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.3.yaml
index bcf0e386ffd72..e7df07eea979b 100644
--- a/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.3.yaml
+++ b/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.3.yaml
@@ -7,10 +7,6 @@ base_images:
     name: builder
     namespace: open-cluster-management
     tag: go1.17-linux
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.4.yaml b/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.4.yaml
index 499d2d0788f46..78da319d86c6d 100644
--- a/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.4.yaml
+++ b/ci-operator/config/stolostron/registration-operator/stolostron-registration-operator-release-2.4.yaml
@@ -7,10 +7,6 @@ base_images:
     name: builder
     namespace: open-cluster-management
     tag: go1.17-linux
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/registration/stolostron-registration-release-2.4.yaml b/ci-operator/config/stolostron/registration/stolostron-registration-release-2.4.yaml
index 6827ca0987fdb..f1113e12f04ae 100644
--- a/ci-operator/config/stolostron/registration/stolostron-registration-release-2.4.yaml
+++ b/ci-operator/config/stolostron/registration/stolostron-registration-release-2.4.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/singapore/stolostron-singapore-main.yaml b/ci-operator/config/stolostron/singapore/stolostron-singapore-main.yaml
index e226009d6791c..4a1c161327a67 100644
--- a/ci-operator/config/stolostron/singapore/stolostron-singapore-main.yaml
+++ b/ci-operator/config/stolostron/singapore/stolostron-singapore-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make image-kcp-ocm-integration-controller
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-main.yaml b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-main.yaml
index c07310bd990e9..e3fc3d924af3d 100644
--- a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-main.yaml
+++ b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-main.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.5.yaml b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.5.yaml
index c025885e7ed0e..d93641e1de2a7 100644
--- a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.5.yaml
+++ b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.5.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.6.yaml b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.6.yaml
index ea88f91c7b2af..7efa84750080a 100644
--- a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.6.yaml
+++ b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.6.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.7.yaml b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.7.yaml
index 5ad0b537bbd6e..23f4edeaf6f2a 100644
--- a/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.7.yaml
+++ b/ci-operator/config/stolostron/volsync-addon-controller/stolostron-volsync-addon-controller-release-2.7.yaml
@@ -1,8 +1,4 @@
 base_images:
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
   stolostron_builder_go1.18-linux:
     name: builder
     namespace: stolostron
diff --git a/ci-operator/config/stolostron/work/stolostron-work-backplane-1.0.yaml b/ci-operator/config/stolostron/work/stolostron-work-backplane-1.0.yaml
index a55ba255a25ed..7b98d41f228c9 100644
--- a/ci-operator/config/stolostron/work/stolostron-work-backplane-1.0.yaml
+++ b/ci-operator/config/stolostron/work/stolostron-work-backplane-1.0.yaml
@@ -7,10 +7,6 @@ base_images:
     name: builder
     namespace: open-cluster-management
     tag: go1.17-linux
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/config/stolostron/work/stolostron-work-release-2.4.yaml b/ci-operator/config/stolostron/work/stolostron-work-release-2.4.yaml
index 2b926ab03420b..944dd17ea32bc 100644
--- a/ci-operator/config/stolostron/work/stolostron-work-release-2.4.yaml
+++ b/ci-operator/config/stolostron/work/stolostron-work-release-2.4.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "8"
-  stolostron_builder_go1.17-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.17-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
diff --git a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master-presubmits.yaml
index fa5316a4c13a9..3bbad63071776 100644
--- a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,12 +16,13 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-baremetal-operator-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-baremetal-operator-master-e2e-metal-ipi-bm
     optional: true
     path_alias: github.com/metal3-io/baremetal-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     spec:
       containers:
       - args:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12-presubmits.yaml
index b7de1c3ced0dd..b00bc9b3ff11f 100644
--- a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,12 +16,13 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-baremetal-operator-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-baremetal-operator-release-4.12-e2e-metal-ipi-bm
     optional: true
     path_alias: github.com/metal3-io/baremetal-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     spec:
       containers:
       - args:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13-presubmits.yaml
index f27a64989eee9..d7fba0e0a767f 100644
--- a/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,12 +16,13 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-baremetal-operator-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-baremetal-operator-release-4.13-e2e-metal-ipi-bm
     optional: true
     path_alias: github.com/metal3-io/baremetal-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     spec:
       containers:
       - args:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-master-presubmits.yaml
index d1c8f8cb34dd2..6bea7f58c2c1a 100644
--- a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-master-e2e-aws
+    name: pull-ci-openshift-priv-builder-master-e2e-aws-builds
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-builds-techpreview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-master-e2e-aws-builds
+    name: pull-ci-openshift-priv-builder-master-e2e-aws-builds-techpreview
+    optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds
+    rerun_command: /test e2e-aws-builds-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - --target=e2e-aws-builds-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-builds-techpreview
+    context: ci/prow/e2e-aws-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,10 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-master-e2e-aws-builds-techpreview
+    name: pull-ci-openshift-priv-builder-master-e2e-aws-cgroupsv2
     optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds-techpreview
+    rerun_command: /test e2e-aws-cgroupsv2
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
-        - --target=e2e-aws-builds-techpreview
+        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - --target=e2e-aws-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-master-e2e-aws-cgroupsv2
-    optional: true
+    name: pull-ci-openshift-priv-builder-master-e2e-aws-image-ecosystem
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,14 +333,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-image-ecosystem
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -352,9 +352,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-master-e2e-aws-image-ecosystem
+    name: pull-ci-openshift-priv-builder-master-e2e-aws-ovn
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-image-ecosystem
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.12-presubmits.yaml
index fbdafed3e3343..e8d8413ca9ccf 100644
--- a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-builds
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-builds-techpreview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-builds
+    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-builds-techpreview
+    optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds
+    rerun_command: /test e2e-aws-builds-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - --target=e2e-aws-builds-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-builds-techpreview
+    context: ci/prow/e2e-aws-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,10 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-builds-techpreview
+    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-cgroupsv2
     optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds-techpreview
+    rerun_command: /test e2e-aws-cgroupsv2
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
-        - --target=e2e-aws-builds-techpreview
+        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - --target=e2e-aws-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-cgroupsv2
-    optional: true
+    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-image-ecosystem
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,14 +333,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-image-ecosystem
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -352,9 +352,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-image-ecosystem
+    name: pull-ci-openshift-priv-builder-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-image-ecosystem
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.13-presubmits.yaml
index d4d301419a5de..4f27be0a83b94 100644
--- a/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/builder/openshift-priv-builder-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-builds
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-builds-techpreview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-builds
+    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-builds-techpreview
+    optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds
+    rerun_command: /test e2e-aws-builds-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - --target=e2e-aws-builds-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-builds-techpreview
+    context: ci/prow/e2e-aws-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,10 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-builds-techpreview
+    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-cgroupsv2
     optional: true
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-builds-techpreview
+    rerun_command: /test e2e-aws-cgroupsv2
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
-        - --target=e2e-aws-builds-techpreview
+        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - --target=e2e-aws-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-cgroupsv2
-    optional: true
+    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-image-ecosystem
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,14 +333,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-image-ecosystem
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -352,9 +352,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-image-ecosystem
+    name: pull-ci-openshift-priv-builder-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/builder
-    rerun_command: /test e2e-aws-image-ecosystem
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-postsubmits.yaml
deleted file mode 100644
index bae699f2e5dab..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.10-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-presubmits.yaml
deleted file mode 100644
index 58ededeb424f0..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.10-presubmits.yaml
+++ /dev/null
@@ -1,292 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.10-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build04
-    context: ci/prow/operator-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.10-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build04
-    context: ci/prow/operator-e2e-latest-osus
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.10-operator-e2e-latest-osus
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e-latest-osus
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile
-        - --target=operator-e2e-latest-osus
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.10-unit
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-postsubmits.yaml
deleted file mode 100644
index c421ad91bc616..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.11-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-presubmits.yaml
deleted file mode 100644
index 9d9ec5c6a7d90..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.11-presubmits.yaml
+++ /dev/null
@@ -1,292 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.11-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build04
-    context: ci/prow/operator-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.11-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build04
-    context: ci/prow/operator-e2e-latest-osus
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.11-operator-e2e-latest-osus
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e-latest-osus
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile
-        - --target=operator-e2e-latest-osus
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.11-unit
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-postsubmits.yaml
deleted file mode 100644
index a1a00633cf5a1..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.5$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.5-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-presubmits.yaml
deleted file mode 100644
index 665ed64d5cef9..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.5-presubmits.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.5$
-    - ^release-4\.5-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.5-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.5$
-    - ^release-4\.5-
-    cluster: build02
-    context: ci/prow/operator-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.5-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.5$
-    - ^release-4\.5-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.5-unit
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-postsubmits.yaml
deleted file mode 100644
index d9b05bafb216c..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.6$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.6-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-presubmits.yaml
deleted file mode 100644
index b61ad4dd39cb6..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.6-presubmits.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.6$
-    - ^release-4\.6-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.6-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.6$
-    - ^release-4\.6-
-    cluster: build02
-    context: ci/prow/operator-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.6-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.6$
-    - ^release-4\.6-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.6-unit
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-postsubmits.yaml
deleted file mode 100644
index 4ada013620721..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.7$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.7-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-postsubmits.yaml
deleted file mode 100644
index f9e5a811ef83d..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.8$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.8-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-postsubmits.yaml
deleted file mode 100644
index 2439e79d6fc0e..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.9$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.9-images
-    path_alias: github.com/openshift/cincinnati-operator
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-presubmits.yaml
deleted file mode 100644
index 24b1f8510cd8d..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.9-presubmits.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.9-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
-    cluster: build02
-    context: ci/prow/operator-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.9-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.9-unit
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=unit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-presubmits.yaml
deleted file mode 100644
index f52c9cce64d0a..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-presubmits.yaml
+++ /dev/null
@@ -1,382 +0,0 @@
-presubmits:
-  openshift-priv/cincinnati:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/cargo-test
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        secret:
-          secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/rustfmt-1.54.0
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/rustfmt-1.58.0
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/yaml-lint
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.10-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-postsubmits.yaml
deleted file mode 100644
index a04830f6d726b..0000000000000
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-postsubmits.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-postsubmits:
-  openshift-priv/cincinnati:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    cluster: build01
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-release-4.11-images
-    path_alias: github.com/openshift/cincinnati
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master-presubmits.yaml
index a0ef9b840beb0..ed283d2218565 100644
--- a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master-presubmits.yaml
@@ -66,12 +66,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )coverage,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-manual-oidc
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -83,10 +83,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cloud-credential-operator-master-e2e-aws-manual-oidc
+    optional: true
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
+        - --target=e2e-aws-manual-oidc
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -147,14 +147,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-manual-oidc
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -166,10 +166,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-master-e2e-aws-manual-oidc
-    optional: true
+    name: pull-ci-openshift-priv-cloud-credential-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws-manual-oidc
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -179,8 +179,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
-        - --target=e2e-aws-manual-oidc
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -196,7 +196,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -230,7 +230,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12-presubmits.yaml
index 16d450c785041..b03429a140ab7 100644
--- a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.12-presubmits.yaml
@@ -66,12 +66,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )coverage,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-manual-oidc
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -83,10 +83,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.12-e2e-aws-manual-oidc
+    optional: true
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
+        - --target=e2e-aws-manual-oidc
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -147,14 +147,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-manual-oidc
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -166,10 +166,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.12-e2e-aws-manual-oidc
-    optional: true
+    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws-manual-oidc
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -179,8 +179,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
-        - --target=e2e-aws-manual-oidc
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -196,7 +196,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -230,7 +230,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13-presubmits.yaml
index bbb8d11938e1e..d06a4c37eff95 100644
--- a/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.13-presubmits.yaml
@@ -66,12 +66,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )coverage,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-manual-oidc
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -83,10 +83,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.13-e2e-aws-manual-oidc
+    optional: true
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
+        - --target=e2e-aws-manual-oidc
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -147,14 +147,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-manual-oidc
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -166,10 +166,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.13-e2e-aws-manual-oidc
-    optional: true
+    name: pull-ci-openshift-priv-cloud-credential-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cloud-credential-operator
-    rerun_command: /test e2e-aws-manual-oidc
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -179,8 +179,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
-        - --target=e2e-aws-manual-oidc
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -196,7 +196,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -230,7 +230,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master-presubmits.yaml
index 054936ef52ff4..d26c7966cc598 100644
--- a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-aws
+    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-aws-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -253,7 +253,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -265,9 +265,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-azure
+    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-azure-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -277,8 +277,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -294,7 +294,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -328,14 +328,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-gcp
+    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-gcp-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,173 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-openstack-ovn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-openstack-ovn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-ovn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-ovn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn-serial-e2e-only,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-openstack-sdn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-master-e2e-openstack-sdn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-sdn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-sdn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-sdn-serial-e2e-only,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12-presubmits.yaml
index a8e2222016701..dd789403b7277 100644
--- a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-aws-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -253,7 +253,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -265,9 +265,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-azure
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-azure-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -277,8 +277,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -294,7 +294,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -328,14 +328,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-gcp-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,173 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-openstack-ovn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-openstack-ovn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-ovn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-ovn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn-serial-e2e-only,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-openstack-sdn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.12-e2e-openstack-sdn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-sdn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-sdn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-sdn-serial-e2e-only,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13-presubmits.yaml
index 50f19e67534cd..294b76e85969e 100644
--- a/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-aws-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -253,7 +253,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -265,9 +265,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-azure
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-azure-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -277,8 +277,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -294,7 +294,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -328,14 +328,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-gcp-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,173 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-openstack-ovn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-openstack-ovn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-ovn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-ovn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn-serial-e2e-only,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-openstack-sdn-serial-e2e-only
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-network-config-controller-release-4.13-e2e-openstack-sdn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-sdn-serial-e2e-only
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-sdn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-sdn-serial-e2e-only,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master-presubmits.yaml
index d0a01a7bc0dd8..10a66d7b94391 100644
--- a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-master-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/cloud-provider-alibaba-cloud:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-alibabacloud
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: alibabacloud
+      ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-master-e2e-alibabacloud
+    optional: true
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test e2e-alibabacloud
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-alibabacloud-cluster-profile
+        - --target=e2e-alibabacloud
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-alibabacloud-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-alibabacloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-alibabacloud,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -114,3 +197,117 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-master-lint
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/unit
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-master-unit
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test unit
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
index a059edbc6549b..5c4d18df1756b 100644
--- a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/cloud-provider-alibaba-cloud:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-alibabacloud
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: alibabacloud
+      ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.12-e2e-alibabacloud
+    optional: true
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test e2e-alibabacloud
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-alibabacloud-cluster-profile
+        - --target=e2e-alibabacloud
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-alibabacloud-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-alibabacloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-alibabacloud,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -114,3 +197,117 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.12-lint
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/unit
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.12-unit
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test unit
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
index 36957a6d533ac..f0b65812d4cef 100644
--- a/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/cloud-provider-alibaba-cloud:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-alibabacloud
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: alibabacloud
+      ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.13-e2e-alibabacloud
+    optional: true
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test e2e-alibabacloud
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-alibabacloud-cluster-profile
+        - --target=e2e-alibabacloud
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-alibabacloud-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-alibabacloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-alibabacloud,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -114,3 +197,117 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.13-lint
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/unit
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cloud-provider-alibaba-cloud-release-4.13-unit
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test unit
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-postsubmits.yaml
similarity index 90%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-postsubmits.yaml
index fa9f3bf20cfe9..c3b268b1600fb 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-postsubmits.yaml
@@ -1,9 +1,9 @@
 postsubmits:
-  openshift-priv/cincinnati-operator:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
+    - ^main$
     cluster: build01
     decorate: true
     decoration_config:
@@ -13,8 +13,8 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-master-images
-    path_alias: github.com/openshift/cincinnati-operator
+    name: branch-ci-openshift-priv-cloud-provider-nutanix-main-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-presubmits.yaml
similarity index 74%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-presubmits.yaml
index ab36a60a79b34..b5d4d29da5ef4 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-main-presubmits.yaml
@@ -1,30 +1,35 @@
 presubmits:
-  openshift-priv/cincinnati-operator:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build02
-    context: ci/prow/images
+    - ^main$
+    - ^main-
+    cluster: build01
+    context: ci/prow/e2e-nutanix
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: nutanix
+      ci-operator.openshift.io/cloud-cluster-profile: nutanix
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-master-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-main-e2e-nutanix
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test e2e-nutanix
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-nutanix-cluster-profile
+        - --target=e2e-nutanix
         command:
         - ci-operator
         image: ci-operator:latest
@@ -34,6 +39,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-nutanix-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -48,6 +61,18 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-nutanix
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -57,37 +82,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build04
-    context: ci/prow/operator-e2e
+    - ^main$
+    - ^main-
+    cluster: build01
+    context: ci/prow/fmt
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-master-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-main-fmt
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test fmt
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
+        - --target=fmt
         command:
         - ci-operator
         image: ci-operator:latest
@@ -97,14 +117,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -119,22 +131,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -144,37 +140,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )fmt,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build04
-    context: ci/prow/operator-e2e-latest-osus
+    - ^main$
+    - ^main-
+    cluster: build01
+    context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-master-operator-e2e-latest-osus
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e-latest-osus
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-main-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test images
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile
-        - --target=operator-e2e-latest-osus
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -184,14 +175,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -206,22 +189,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -231,13 +198,13 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build02
+    - ^main$
+    - ^main-
+    cluster: build01
     context: ci/prow/unit
     decorate: true
     decoration_config:
@@ -246,8 +213,8 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-master-unit
-    path_alias: github.com/openshift/cincinnati-operator
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-main-unit
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     rerun_command: /test unit
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-postsubmits.yaml
similarity index 91%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-postsubmits.yaml
index e4833d1262210..d7cca4d55616f 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-postsubmits.yaml
@@ -1,5 +1,5 @@
 postsubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
@@ -13,8 +13,8 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-release-4.12-images
-    path_alias: github.com/openshift/cincinnati
+    name: branch-ci-openshift-priv-cloud-provider-nutanix-release-4.12-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-presubmits.yaml
similarity index 75%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-presubmits.yaml
index e30bb78d910db..790d667f7cf72 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.12-presubmits.yaml
@@ -1,30 +1,35 @@
 presubmits:
-  openshift-priv/cincinnati-operator:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/images
+    cluster: build01
+    context: ci/prow/e2e-nutanix
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: nutanix
+      ci-operator.openshift.io/cloud-cluster-profile: nutanix
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.12-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.12-e2e-nutanix
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test e2e-nutanix
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-nutanix-cluster-profile
+        - --target=e2e-nutanix
         command:
         - ci-operator
         image: ci-operator:latest
@@ -34,6 +39,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-nutanix-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -48,6 +61,18 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-nutanix
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -57,37 +82,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build04
-    context: ci/prow/operator-e2e
+    cluster: build01
+    context: ci/prow/fmt
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.12-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.12-fmt
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test fmt
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
+        - --target=fmt
         command:
         - ci-operator
         image: ci-operator:latest
@@ -97,14 +117,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -119,22 +131,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -144,37 +140,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )fmt,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build04
-    context: ci/prow/operator-e2e-latest-osus
+    cluster: build01
+    context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.12-operator-e2e-latest-osus
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e-latest-osus
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.12-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test images
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile
-        - --target=operator-e2e-latest-osus
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -184,14 +175,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -206,22 +189,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -231,13 +198,13 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
+    cluster: build01
     context: ci/prow/unit
     decorate: true
     decoration_config:
@@ -246,8 +213,8 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.12-unit
-    path_alias: github.com/openshift/cincinnati-operator
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.12-unit
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     rerun_command: /test unit
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-postsubmits.yaml
similarity index 91%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-postsubmits.yaml
index 583bf53e9cd4b..41683da6ed9cd 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-postsubmits.yaml
@@ -1,5 +1,5 @@
 postsubmits:
-  openshift-priv/cincinnati-operator:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
@@ -13,8 +13,8 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.13-images
-    path_alias: github.com/openshift/cincinnati-operator
+    name: branch-ci-openshift-priv-cloud-provider-nutanix-release-4.13-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-presubmits.yaml
similarity index 75%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-presubmits.yaml
index 347e168cda2ce..33d064c0e54a4 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.13-presubmits.yaml
@@ -1,30 +1,35 @@
 presubmits:
-  openshift-priv/cincinnati-operator:
+  openshift-priv/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/images
+    context: ci/prow/e2e-nutanix
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: nutanix
+      ci-operator.openshift.io/cloud-cluster-profile: nutanix
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.13-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.13-e2e-nutanix
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test e2e-nutanix
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-nutanix-cluster-profile
+        - --target=e2e-nutanix
         command:
         - ci-operator
         image: ci-operator:latest
@@ -34,6 +39,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-nutanix-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -48,6 +61,18 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-nutanix
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -57,37 +82,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build04
-    context: ci/prow/operator-e2e
+    cluster: build01
+    context: ci/prow/fmt
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.13-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.13-fmt
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test fmt
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
+        - --target=fmt
         command:
         - ci-operator
         image: ci-operator:latest
@@ -97,14 +117,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -119,22 +131,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -144,37 +140,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )fmt,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build04
-    context: ci/prow/operator-e2e-latest-osus
+    cluster: build01
+    context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.13-operator-e2e-latest-osus
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e-latest-osus
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.13-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test images
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile
-        - --target=operator-e2e-latest-osus
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -184,14 +175,6 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -206,22 +189,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -231,7 +198,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -246,8 +213,8 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.13-unit
-    path_alias: github.com/openshift/cincinnati-operator
+    name: pull-ci-openshift-priv-cloud-provider-nutanix-release-4.13-unit
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     rerun_command: /test unit
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml
index 1569bcb336c12..9d7b802dacbb1 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api-provider-aws
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12-presubmits.yaml
index f274869b919cd..1aec562a48eeb 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-provider-aws-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-provider-aws-release-4.12-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api-provider-aws
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13-presubmits.yaml
index 285573ba461fd..a82fd0a47a9da 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-provider-aws-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-provider-aws-release-4.13-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api-provider-aws
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml
index 2f89c485f1061..2791a02dfcf7f 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12-presubmits.yaml
index 37b391c3dd3b5..9114c89e25b9c 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-release-4.12-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13-presubmits.yaml
index 4fa296fa2d99e..6cd8a721d58ee 100644
--- a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-api-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-api-release-4.13-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master-presubmits.yaml
index 937aa20fe439c..a09453afbe51d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-master-presubmits.yaml
@@ -250,12 +250,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-dualstack
+    optional: true
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi
-    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -331,14 +331,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -350,10 +350,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-dualstack
-    optional: true
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-ipv6
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,14 +414,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,11 +431,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-master-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -446,8 +447,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +464,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,7 +498,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12-presubmits.yaml
index 32877dd23380f..3d92e8a03c016 100644
--- a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.12-presubmits.yaml
@@ -250,12 +250,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
+    optional: true
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi
-    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -331,14 +331,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -350,10 +350,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
-    optional: true
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,14 +414,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,11 +431,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -446,8 +447,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +464,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,7 +498,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13-presubmits.yaml
index 2c0e04ca1d249..8cd600fa99ef8 100644
--- a/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-baremetal-operator/openshift-priv-cluster-baremetal-operator-release-4.13-presubmits.yaml
@@ -250,12 +250,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
+    optional: true
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi
-    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -331,14 +331,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -350,10 +350,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
-    optional: true
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,14 +414,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,11 +431,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/cluster-baremetal-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -446,8 +447,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +464,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,7 +498,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master-presubmits.yaml
index c0b22bf7a5bdb..3670b8f7b7362 100644
--- a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-config-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-config-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-config-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12-presubmits.yaml
index 9404138d31505..73180e2d3fe6b 100644
--- a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-config-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-config-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-config-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13-presubmits.yaml
index 1e9c5b0541995..490c47a775a83 100644
--- a/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-config-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-config-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-config-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-postsubmits.yaml
index b9e24d22239a3..7b3cf62f25d84 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-postsubmits.yaml
@@ -7,7 +7,9 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-presubmits.yaml
index 17b5eb91fd85f..e99800c15e32a 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main-presubmits.yaml
@@ -6,19 +6,22 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-main-e2e-aws
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-main-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -29,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -46,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -74,36 +77,34 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-main-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -159,16 +160,13 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -178,7 +176,9 @@ presubmits:
     context: ci/prow/e2e-aws-serial
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -243,9 +243,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -262,7 +259,9 @@ presubmits:
     context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -327,9 +326,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -346,7 +342,9 @@ presubmits:
     context: ci/prow/fmt
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -385,9 +383,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -404,7 +399,9 @@ presubmits:
     context: ci/prow/generate
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -443,9 +440,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -462,7 +456,9 @@ presubmits:
     context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -501,9 +497,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -520,7 +513,9 @@ presubmits:
     context: ci/prow/lint
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -559,9 +554,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -578,7 +570,9 @@ presubmits:
     context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -617,9 +611,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -636,7 +627,9 @@ presubmits:
     context: ci/prow/vendor
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -675,9 +668,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -694,7 +684,9 @@ presubmits:
     context: ci/prow/vet
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -733,9 +725,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
index 63ff98afd1b99..7a24cb30b2e42 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
@@ -7,7 +7,9 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
index f31c72fcbe096..8f05c3d3a660c 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
@@ -6,19 +6,22 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -29,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -46,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -74,36 +77,34 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -159,16 +160,13 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -178,7 +176,9 @@ presubmits:
     context: ci/prow/e2e-aws-serial
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -243,9 +243,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -262,7 +259,9 @@ presubmits:
     context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -327,9 +326,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -346,7 +342,9 @@ presubmits:
     context: ci/prow/fmt
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -385,9 +383,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -404,7 +399,9 @@ presubmits:
     context: ci/prow/generate
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -443,9 +440,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -462,7 +456,9 @@ presubmits:
     context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -501,9 +497,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -520,7 +513,9 @@ presubmits:
     context: ci/prow/lint
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -559,9 +554,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -578,7 +570,9 @@ presubmits:
     context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -617,9 +611,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -636,7 +627,9 @@ presubmits:
     context: ci/prow/vendor
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -675,9 +668,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -694,7 +684,9 @@ presubmits:
     context: ci/prow/vet
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -733,9 +725,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
index 9f30c568a15c1..4d5b0fdd5aa15 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
@@ -7,7 +7,9 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
index 89fad41c479c8..caf1b97db59f7 100644
--- a/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
@@ -6,19 +6,22 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -29,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -46,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -74,36 +77,34 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-control-plane-machine-set-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -159,16 +160,13 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -178,7 +176,9 @@ presubmits:
     context: ci/prow/e2e-aws-serial
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -243,9 +243,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -262,7 +259,9 @@ presubmits:
     context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -327,9 +326,6 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -346,7 +342,9 @@ presubmits:
     context: ci/prow/fmt
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -385,9 +383,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -404,7 +399,9 @@ presubmits:
     context: ci/prow/generate
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -443,9 +440,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -462,7 +456,9 @@ presubmits:
     context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -501,9 +497,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -520,7 +513,9 @@ presubmits:
     context: ci/prow/lint
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -559,9 +554,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -578,7 +570,9 @@ presubmits:
     context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -617,9 +611,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -636,7 +627,9 @@ presubmits:
     context: ci/prow/vendor
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -675,9 +668,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -694,7 +684,9 @@ presubmits:
     context: ci/prow/vet
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -733,9 +725,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master-presubmits.yaml
index 063564c4e9a2a..cdac2e682de23 100644
--- a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-dns-operator-master-e2e-aws-operator
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-master-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-dns-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12-presubmits.yaml
index 6d10cb997cbae..ca405eade855f 100644
--- a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.12-e2e-aws-operator
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.12-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13-presubmits.yaml
index fa2141865f23a..60ca10be669f4 100644
--- a/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.13-e2e-aws-operator
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.13-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-dns-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-dns-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master-presubmits.yaml
index 6a57542924434..dcc8a7ebadf8b 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-master-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-master-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-master-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +588,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -602,6 +608,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-master-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -664,7 +671,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -685,6 +692,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -747,7 +755,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -768,6 +776,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -834,7 +843,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -855,6 +864,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -921,7 +931,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -942,6 +952,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1095,7 +1106,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1116,6 +1127,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1182,7 +1194,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1203,6 +1215,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1269,7 +1282,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1290,6 +1303,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1352,7 +1366,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1373,6 +1387,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1435,7 +1450,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1456,6 +1471,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1518,7 +1534,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1539,6 +1555,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-serial-ipv4
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1601,7 +1618,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1622,6 +1639,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1684,7 +1702,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -1704,6 +1722,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-master-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10-presubmits.yaml
index cd05c8504f5cf..ab8c9fbab9bc8 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.10-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.10-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.10-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.10-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -500,7 +506,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -520,6 +526,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.10-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +589,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -603,6 +610,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -665,7 +673,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -686,6 +694,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -752,7 +761,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -773,6 +782,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -839,7 +849,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -860,6 +870,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -926,7 +937,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -947,6 +958,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1013,7 +1025,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1034,6 +1046,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1100,7 +1113,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1121,6 +1134,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1187,7 +1201,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1208,6 +1222,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1270,7 +1285,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1291,6 +1306,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1353,7 +1369,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1374,6 +1390,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1436,7 +1453,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1457,6 +1474,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-serial-ipv4
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1519,7 +1537,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1540,6 +1558,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1602,7 +1621,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.10$
     - ^release-4\.10-
@@ -1622,6 +1641,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.10-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11-presubmits.yaml
index 30153eec4e332..77be38d77309b 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.11-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -500,7 +506,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -520,6 +526,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-e2e-aws-serial
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-serial
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +589,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -602,6 +609,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -664,7 +672,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -685,6 +693,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -747,7 +756,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -768,6 +777,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -834,7 +844,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -855,6 +865,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -921,7 +932,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -942,6 +953,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1008,7 +1020,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1029,6 +1041,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1095,7 +1108,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1116,6 +1129,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1182,7 +1196,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1203,6 +1217,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1269,7 +1284,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1290,6 +1305,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1352,7 +1368,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1373,6 +1389,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1435,7 +1452,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1456,6 +1473,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1518,7 +1536,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1539,6 +1557,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-serial-ipv4
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1601,7 +1620,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1622,6 +1641,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1684,7 +1704,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.11$
     - ^release-4\.11-
@@ -1704,6 +1724,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.11-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12-presubmits.yaml
index 9b6fcb8903747..ef4a935ee5994 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.12-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.12-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.12-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.12-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +588,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -602,6 +608,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.12-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -664,7 +671,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -685,6 +692,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -747,7 +755,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -768,6 +776,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -834,7 +843,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -855,6 +864,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -921,7 +931,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -942,6 +952,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1095,7 +1106,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1116,6 +1127,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1182,7 +1194,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1203,6 +1215,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1269,7 +1282,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1290,6 +1303,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1352,7 +1366,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1373,6 +1387,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1435,7 +1450,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1456,6 +1471,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1518,7 +1534,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1539,6 +1555,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-serial-ipv4
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1601,7 +1618,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1622,6 +1639,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1684,7 +1702,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -1704,6 +1722,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.12-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13-presubmits.yaml
index cf8a95ae7f6f2..38ca6ecb3546d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.13-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.13-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.13-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.13-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +588,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -602,6 +608,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.13-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -664,7 +671,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -685,6 +692,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -747,7 +755,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -768,6 +776,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -834,7 +843,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -855,6 +864,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -921,7 +931,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -942,6 +952,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1095,7 +1106,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1116,6 +1127,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1182,7 +1194,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1203,6 +1215,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1269,7 +1282,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1290,6 +1303,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1352,7 +1366,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1373,6 +1387,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1435,7 +1450,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1456,6 +1471,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1518,7 +1534,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1539,6 +1555,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi-serial-ipv4
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1601,7 +1618,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1622,6 +1639,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1684,7 +1702,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -1704,6 +1722,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.13-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8-presubmits.yaml
index 909eec6e2ec6a..b5608e808ed1c 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.8-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -500,7 +506,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -520,6 +526,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-e2e-aws-single-node
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -582,7 +589,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -603,6 +610,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -665,7 +673,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -686,6 +694,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -752,7 +761,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -773,6 +782,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -839,7 +849,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -860,6 +870,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -926,7 +937,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -947,6 +958,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1013,7 +1025,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1034,6 +1046,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1100,7 +1113,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1121,6 +1134,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1187,7 +1201,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1208,6 +1222,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1270,7 +1285,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1291,6 +1306,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1353,7 +1369,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1373,6 +1389,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-e2e-metal-single-node-live-iso
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1435,7 +1452,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.8$
     - ^release-4\.8-
@@ -1455,6 +1472,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.8-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9-presubmits.yaml
index d6d406a0e8b82..e60eb65fedde8 100644
--- a/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-priv/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -21,6 +21,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.9-configmap-scale
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test configmap-scale
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -83,7 +84,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )configmap-scale,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -103,6 +104,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.9-e2e-agnostic
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -165,7 +167,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -185,6 +187,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.9-e2e-agnostic-upgrade
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -251,7 +254,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -272,6 +275,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -334,7 +338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -355,6 +359,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -417,7 +422,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -438,6 +443,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -500,7 +506,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -521,6 +527,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-aws-single-node
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -583,7 +590,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -604,6 +611,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-azure
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -666,7 +674,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -687,6 +695,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -753,7 +762,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -774,6 +783,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -840,7 +850,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -861,6 +871,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -927,7 +938,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -948,6 +959,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-disruptive-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1014,7 +1026,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1035,6 +1047,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1101,7 +1114,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1122,6 +1135,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1188,7 +1202,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1209,6 +1223,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-assisted
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1271,7 +1286,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1292,6 +1307,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-ipi
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1354,7 +1370,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1375,6 +1391,7 @@ presubmits:
     optional: true
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-metal-single-node-live-iso
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
@@ -1437,7 +1454,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-single-node-live-iso,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.9$
     - ^release-4\.9-
@@ -1457,6 +1474,7 @@ presubmits:
     name: pull-ci-openshift-priv-cluster-etcd-operator-release-4.9-e2e-operator
     path_alias: github.com/openshift/cluster-etcd-operator
     rerun_command: /test e2e-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master-presubmits.yaml
index 03d059a410e8b..37b0c680cff01 100644
--- a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-master-presubmits.yaml
@@ -255,7 +255,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-master-e2e-azure
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-master-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -281,8 +281,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -298,7 +298,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -332,14 +332,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -351,10 +351,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-master-e2e-azure-operator
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-master-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12-presubmits.yaml
index 0f67329298c15..44fd77ceb783e 100644
--- a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.12-presubmits.yaml
@@ -255,7 +255,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.12-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -281,8 +281,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -298,7 +298,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -332,14 +332,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -351,10 +351,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.12-e2e-azure-operator
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.12-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13-presubmits.yaml
index 0ae4e5c53cf42..4beaa5ef0fe0d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.13-presubmits.yaml
@@ -255,7 +255,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -267,10 +267,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.13-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -281,8 +281,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -298,7 +298,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -332,14 +332,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -351,10 +351,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.13-e2e-azure-operator
+    name: pull-ci-openshift-priv-cluster-image-registry-operator-release-4.13-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-image-registry-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -365,8 +365,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -382,7 +382,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -416,7 +416,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml
index f1766588ce56b..2e84796b62812 100644
--- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator-disruptive-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-master-e2e-aws-operator-disruptive-single-node
+    optional: true
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator-disruptive-single-node
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - --target=e2e-aws-operator-disruptive-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-operator-disruptive-single-node
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-master-e2e-aws-operator-disruptive-single-node
-    optional: true
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws-operator-disruptive-single-node
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
-        - --target=e2e-aws-operator-disruptive-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
index 1357c9d22b626..74e342499f057 100644
--- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator-disruptive-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.12-e2e-aws-operator-disruptive-single-node
+    optional: true
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator-disruptive-single-node
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - --target=e2e-aws-operator-disruptive-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-operator-disruptive-single-node
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.12-e2e-aws-operator-disruptive-single-node
-    optional: true
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws-operator-disruptive-single-node
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
-        - --target=e2e-aws-operator-disruptive-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
index a98c0808e5c19..8f2dd93ad393c 100644
--- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator-disruptive-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.13-e2e-aws-operator-disruptive-single-node
+    optional: true
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator-disruptive-single-node
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - --target=e2e-aws-operator-disruptive-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-operator-disruptive-single-node
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.13-e2e-aws-operator-disruptive-single-node
-    optional: true
+    name: pull-ci-openshift-priv-cluster-kube-apiserver-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-kube-apiserver-operator
-    rerun_command: /test e2e-aws-operator-disruptive-single-node
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
-        - --target=e2e-aws-operator-disruptive-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
index 5976c2dcc2936..6701f0110a518 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
@@ -1150,6 +1150,266 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-network-migration-rollback,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-ovn-ipv4,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv6
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv6
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv6
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv6
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-network-mtu-migration-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-sdn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-master-e2e-network-mtu-migration-sdn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-sdn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-sdn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-sdn-ipv4,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12-presubmits.yaml
index 0741d9be8dcee..83f5ce6ea386e 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12-presubmits.yaml
@@ -1150,6 +1150,266 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-network-migration-rollback,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.12-e2e-network-mtu-migration-ovn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-ovn-ipv4,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv6
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.12-e2e-network-mtu-migration-ovn-ipv6
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv6
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv6
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-network-mtu-migration-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-sdn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.12-e2e-network-mtu-migration-sdn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-sdn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-sdn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-sdn-ipv4,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13-presubmits.yaml
index 1ee7f0f85e846..5c2d3fc33d1e1 100644
--- a/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.13-presubmits.yaml
@@ -1150,6 +1150,266 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-network-migration-rollback,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.13-e2e-network-mtu-migration-ovn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-ovn-ipv4,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv6
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.13-e2e-network-mtu-migration-ovn-ipv6
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv6
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv6
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-network-mtu-migration-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-sdn-ipv4
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+      timeout: 5h0m0s
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-network-operator-release-4.13-e2e-network-mtu-migration-sdn-ipv4
+    optional: true
+    path_alias: github.com/openshift/cluster-network-operator
+    rerun_command: /test e2e-network-mtu-migration-sdn-ipv4
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-sdn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-sdn-ipv4,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master-presubmits.yaml
index 0ad82cd899880..c1594ad4941d4 100644
--- a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-master-e2e-aws-operator
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-master-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12-presubmits.yaml
index 5bf01190d08d1..f12f87d7d736e 100644
--- a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.12-e2e-aws-operator
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.12-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13-presubmits.yaml
index f76d73e1e87cc..3a5fde8b61cbe 100644
--- a/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.13-e2e-aws-operator
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.13-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-node-tuning-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-node-tuning-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master-presubmits.yaml
index 6ab8bd27480e6..4554f6265a61b 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-master-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-master-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
index 8925c03c58c82..986f47844cad3 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
index af5ceb3a5e3f2..026600ba37163 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +81,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-apiserver-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml
index d9132cbc50fa3..8b85ac26e32a1 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-master-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-master-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
index ae34256b4c9d2..88de475e6beb5 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
index 2b76a0e318428..6988ac4da1883 100644
--- a/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-operator
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-operator
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master-presubmits.yaml
index c188802878203..9b40edb1fe1c4 100644
--- a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-aws-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-aws-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -336,7 +336,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -348,10 +348,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-csi
     spec:
       containers:
       - args:
@@ -361,8 +361,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
+        - --target=e2e-azure-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -378,7 +378,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -412,14 +412,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure-csi
+    context: ci/prow/e2e-azure-file-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,10 +431,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure-file-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-csi
+    rerun_command: /test e2e-azure-file-csi
     spec:
       containers:
       - args:
@@ -444,8 +444,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
-        - --target=e2e-azure-csi
+        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
+        - --target=e2e-azure-file-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -461,7 +461,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -495,14 +495,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure-file-csi
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -514,10 +514,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure-file-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-file-csi
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -527,8 +527,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
-        - --target=e2e-azure-file-csi
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -544,7 +544,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -578,14 +578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -597,9 +597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-gcp
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -609,8 +610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -626,7 +627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -664,14 +665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -683,10 +684,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-gcp-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-master-e2e-gcp-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -696,8 +696,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -713,7 +713,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -751,7 +751,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12-presubmits.yaml
index 936234877f663..42c1a939a705d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-aws-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-aws-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -336,7 +336,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -348,10 +348,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-csi
     spec:
       containers:
       - args:
@@ -361,8 +361,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
+        - --target=e2e-azure-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -378,7 +378,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -412,14 +412,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure-csi
+    context: ci/prow/e2e-azure-file-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,10 +431,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure-file-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-csi
+    rerun_command: /test e2e-azure-file-csi
     spec:
       containers:
       - args:
@@ -444,8 +444,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
-        - --target=e2e-azure-csi
+        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
+        - --target=e2e-azure-file-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -461,7 +461,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -495,14 +495,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure-file-csi
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -514,10 +514,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure-file-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-file-csi
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -527,8 +527,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
-        - --target=e2e-azure-file-csi
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -544,7 +544,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -578,14 +578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -597,9 +597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -609,8 +610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -626,7 +627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -664,14 +665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -683,10 +684,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-gcp-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.12-e2e-gcp-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -696,8 +696,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -713,7 +713,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -751,7 +751,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13-presubmits.yaml
index 4807ea6e4cc26..3446683a68562 100644
--- a/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-storage-operator/openshift-priv-cluster-storage-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-aws-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -30,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,10 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-aws-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -113,8 +113,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -130,7 +130,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -164,7 +164,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -336,7 +336,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -348,10 +348,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-csi
     spec:
       containers:
       - args:
@@ -361,8 +361,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
+        - --target=e2e-azure-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -378,7 +378,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -412,14 +412,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-csi
+    context: ci/prow/e2e-azure-file-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -431,10 +431,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure-file-csi
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-csi
+    rerun_command: /test e2e-azure-file-csi
     spec:
       containers:
       - args:
@@ -444,8 +444,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
-        - --target=e2e-azure-csi
+        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
+        - --target=e2e-azure-file-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -461,7 +461,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -495,14 +495,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-file-csi
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -514,10 +514,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure-file-csi
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-azure-file-csi
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -527,8 +527,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
-        - --target=e2e-azure-file-csi
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -544,7 +544,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -578,14 +578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -597,9 +597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -609,8 +610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -626,7 +627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -664,14 +665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -683,10 +684,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-gcp-csi
-    optional: true
+    name: pull-ci-openshift-priv-cluster-storage-operator-release-4.13-e2e-gcp-ovn
     path_alias: github.com/openshift/cluster-storage-operator
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -696,8 +696,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -713,7 +713,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -751,7 +751,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml
index f0792c9d1a700..3fef86086c09d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml
@@ -172,7 +172,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-upgrade
+    name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-upgrade-into-change
     path_alias: github.com/openshift/cluster-version-operator
-    rerun_command: /test e2e-agnostic-upgrade
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,90 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-upgrade-out-of-change
+    path_alias: github.com/openshift/cluster-version-operator
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-azure4
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12-presubmits.yaml
index ea4896e271c1b..a50295701831d 100644
--- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.12-presubmits.yaml
@@ -172,7 +172,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-version-operator-release-4.12-e2e-agnostic-upgrade
+    name: pull-ci-openshift-priv-cluster-version-operator-release-4.12-e2e-agnostic-upgrade-into-change
     path_alias: github.com/openshift/cluster-version-operator
-    rerun_command: /test e2e-agnostic-upgrade
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,90 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-version-operator-release-4.12-e2e-agnostic-upgrade-out-of-change
+    path_alias: github.com/openshift/cluster-version-operator
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-azure4
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13-presubmits.yaml
index e53ddf92356d7..db83743900e2c 100644
--- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.13-presubmits.yaml
@@ -172,7 +172,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cluster-version-operator-release-4.13-e2e-agnostic-upgrade
+    name: pull-ci-openshift-priv-cluster-version-operator-release-4.13-e2e-agnostic-upgrade-into-change
     path_alias: github.com/openshift/cluster-version-operator
-    rerun_command: /test e2e-agnostic-upgrade
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,90 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-version-operator-release-4.13-e2e-agnostic-upgrade-out-of-change
+    path_alias: github.com/openshift/cluster-version-operator
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-azure4
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-master-presubmits.yaml
index 6bb99242df7a9..36ab9abeeff3d 100644
--- a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-master-presubmits.yaml
@@ -335,7 +335,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-console-operator-master-e2e-gcp
+    name: pull-ci-openshift-priv-console-operator-master-e2e-gcp-ovn
     path_alias: github.com/openshift/console-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12-presubmits.yaml
index 755ce7b8a65c2..90bfb37316b62 100644
--- a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.12-presubmits.yaml
@@ -335,7 +335,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-console-operator-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-console-operator-release-4.12-e2e-gcp-ovn
     path_alias: github.com/openshift/console-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13-presubmits.yaml
index 50651e0fafc21..ca11ea6fafa43 100644
--- a/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/console-operator/openshift-priv-console-operator-release-4.13-presubmits.yaml
@@ -335,7 +335,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,9 +347,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-console-operator-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-console-operator-release-4.13-e2e-gcp-ovn
     path_alias: github.com/openshift/console-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -359,8 +359,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -376,7 +376,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -414,7 +414,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-postsubmits.yaml
similarity index 83%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-postsubmits.yaml
index 8f6b72de06300..321eff9a28070 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-postsubmits.yaml
@@ -1,20 +1,22 @@
 postsubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/gcp-filestore-csi-driver-operator:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
+    - ^main$
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-master-images
-    path_alias: github.com/openshift/cincinnati
+    name: branch-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
     spec:
       containers:
       - args:
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml
index 2214372c9d0f0..b8227f8bf0a51 100644
--- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml
@@ -6,17 +6,19 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/unit
+    context: ci/prow/ci-index-gcp-filestore-csi-driver-operator-bundle
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-unit
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-ci-index-gcp-filestore-csi-driver-operator-bundle
     path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
-    rerun_command: /test unit
+    rerun_command: /test ci-index-gcp-filestore-csi-driver-operator-bundle
     spec:
       containers:
       - args:
@@ -24,7 +26,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=ci-index-gcp-filestore-csi-driver-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,13 +50,211 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index-gcp-filestore-csi-driver-operator-bundle,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build04
+    context: ci/prow/operator-e2e
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-operator-e2e
+    optional: true
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test operator-e2e
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )operator-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build01
+    context: ci/prow/verify
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-verify
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test verify
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=verify
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-postsubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml
similarity index 83%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml
index 3be99f0b8e76c..e4592ea7d8582 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml
@@ -1,20 +1,22 @@
 postsubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/gcp-filestore-csi-driver-operator:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.9$
+    - ^release-4\.12$
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-release-4.9-images
-    path_alias: github.com/openshift/cincinnati
+    name: branch-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
     spec:
       containers:
       - args:
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
index 73be9beca0658..e0ff58d4e195f 100644
--- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
@@ -6,17 +6,19 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/unit
+    context: ci/prow/ci-index-gcp-filestore-csi-driver-operator-bundle
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-unit
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-ci-index-gcp-filestore-csi-driver-operator-bundle
     path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
-    rerun_command: /test unit
+    rerun_command: /test ci-index-gcp-filestore-csi-driver-operator-bundle
     spec:
       containers:
       - args:
@@ -24,7 +26,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=ci-index-gcp-filestore-csi-driver-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,13 +50,211 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index-gcp-filestore-csi-driver-operator-bundle,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build04
+    context: ci/prow/operator-e2e
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-operator-e2e
+    optional: true
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test operator-e2e
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )operator-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/verify
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-verify
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test verify
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=verify
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml
similarity index 84%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml
index ddc8b040c26d1..b8db19968cb2b 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml
@@ -1,5 +1,5 @@
 postsubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/gcp-filestore-csi-driver-operator:
   - agent: kubernetes
     always_run: true
     branches:
@@ -7,14 +7,16 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-release-4.13-images
-    path_alias: github.com/openshift/cincinnati
+    name: branch-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
     spec:
       containers:
       - args:
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
index 2b2598603a93a..154a2baeccc80 100644
--- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
@@ -6,17 +6,19 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/unit
+    context: ci/prow/ci-index-gcp-filestore-csi-driver-operator-bundle
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-unit
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-ci-index-gcp-filestore-csi-driver-operator-bundle
     path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
-    rerun_command: /test unit
+    rerun_command: /test ci-index-gcp-filestore-csi-driver-operator-bundle
     spec:
       containers:
       - args:
@@ -24,7 +26,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=ci-index-gcp-filestore-csi-driver-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,13 +50,211 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index-gcp-filestore-csi-driver-operator-bundle,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-images
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build04
+    context: ci/prow/operator-e2e
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-operator-e2e
+    optional: true
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test operator-e2e
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )operator-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/verify
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-verify
+    path_alias: github.com/openshift/gcp-filestore-csi-driver-operator
+    rerun_command: /test verify
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=verify
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-main-presubmits.yaml
index d851153779018..c7f2430cb6ba7 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-main-presubmits.yaml
@@ -85,12 +85,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )capi-provider-agent-sanity,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws-metrics
+    context: ci/prow/e2e-aws
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,20 +100,19 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-main-e2e-aws-metrics
-    optional: true
+    name: pull-ci-openshift-priv-hypershift-main-e2e-aws
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-metrics
+    rerun_command: /test e2e-aws
+    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-metrics
+        - --target=e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,9 +131,6 @@ presubmits:
         - mountPath: /usr/local/github-credentials
           name: github-credentials-openshift-ci-robot-private-git-cloner
           readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -146,23 +142,20 @@ presubmits:
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws-nested
+    context: ci/prow/e2e-aws-metrics
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -172,10 +165,10 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-main-e2e-aws-nested
+    name: pull-ci-openshift-priv-hypershift-main-e2e-aws-metrics
+    optional: true
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-nested
-    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-aws-metrics
     spec:
       containers:
       - args:
@@ -184,7 +177,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-nested
+        - --target=e2e-aws-metrics
         command:
         - ci-operator
         image: ci-operator:latest
@@ -220,7 +213,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-nested,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10-presubmits.yaml
index 439a2d42e7665..4848c472ecebb 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.10-presubmits.yaml
@@ -1,369 +1,5 @@
 presubmits:
   openshift-priv/hypershift:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e-aws
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.10-e2e-aws
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
-      - 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\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e-aws-all
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.10-e2e-aws-all
-    optional: true
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-all
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-all
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-all,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e-aws-metrics
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.10-e2e-aws-metrics
-    optional: true
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-metrics
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-metrics
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e-conformance
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.10-e2e-conformance
-    optional: true
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-conformance
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-conformance
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-conformance,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build01
-    context: ci/prow/e2e-kubevirt-all
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci-operator.openshift.io/cloud: azure4
-      ci-operator.openshift.io/cloud-cluster-profile: azure4
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.10-e2e-kubevirt-all
-    optional: true
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-kubevirt-all
-    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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-kubevirt-all-cluster-profile
-        - --target=e2e-kubevirt-all
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/e2e-kubevirt-all-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        secret:
-          secretName: cluster-secrets-azure4
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-kubevirt-all,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11-presubmits.yaml
index b3a7364430cba..d7c9af3536269 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.11-presubmits.yaml
@@ -108,7 +108,6 @@ presubmits:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
@@ -132,9 +131,6 @@ presubmits:
         - mountPath: /usr/local/github-credentials
           name: github-credentials-openshift-ci-robot-private-git-cloner
           readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -146,9 +142,6 @@ presubmits:
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -156,78 +149,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build01
-    context: ci/prow/e2e-aws-all
-    decorate: true
-    decoration_config:
-      oauth_token_secret:
-        key: oauth
-        name: github-credentials-openshift-ci-robot-private-git-cloner
-    hidden: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.11-e2e-aws-all
-    optional: true
-    path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-all
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-all
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-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: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-all,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -252,7 +173,6 @@ presubmits:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
@@ -276,9 +196,6 @@ presubmits:
         - mountPath: /usr/local/github-credentials
           name: github-credentials-openshift-ci-robot-private-git-cloner
           readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -290,9 +207,6 @@ presubmits:
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12-presubmits.yaml
index ab63ae3d4cb7d..7fe5a48054796 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.12-presubmits.yaml
@@ -85,12 +85,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )capi-provider-agent-sanity,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-metrics
+    context: ci/prow/e2e-aws
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,20 +100,19 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.12-e2e-aws-metrics
-    optional: true
+    name: pull-ci-openshift-priv-hypershift-release-4.12-e2e-aws
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-metrics
+    rerun_command: /test e2e-aws
+    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-metrics
+        - --target=e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,9 +131,6 @@ presubmits:
         - mountPath: /usr/local/github-credentials
           name: github-credentials-openshift-ci-robot-private-git-cloner
           readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -146,23 +142,20 @@ presubmits:
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-nested
+    context: ci/prow/e2e-aws-metrics
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -172,10 +165,10 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.12-e2e-aws-nested
+    name: pull-ci-openshift-priv-hypershift-release-4.12-e2e-aws-metrics
+    optional: true
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-nested
-    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-aws-metrics
     spec:
       containers:
       - args:
@@ -184,7 +177,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-nested
+        - --target=e2e-aws-metrics
         command:
         - ci-operator
         image: ci-operator:latest
@@ -220,7 +213,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-nested,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13-presubmits.yaml
index 2a5db00afbb2e..d8acb1456d50e 100644
--- a/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.13-presubmits.yaml
@@ -85,12 +85,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )capi-provider-agent-sanity,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-metrics
+    context: ci/prow/e2e-aws
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,20 +100,19 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.13-e2e-aws-metrics
-    optional: true
+    name: pull-ci-openshift-priv-hypershift-release-4.13-e2e-aws
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-metrics
+    rerun_command: /test e2e-aws
+    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-metrics
+        - --target=e2e-aws
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,9 +131,6 @@ presubmits:
         - mountPath: /usr/local/github-credentials
           name: github-credentials-openshift-ci-robot-private-git-cloner
           readOnly: true
-        - mountPath: /secrets/hive-hive-credentials
-          name: hive-hive-credentials
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -146,23 +142,20 @@ presubmits:
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: hive-hive-credentials
-        secret:
-          secretName: hive-hive-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-nested
+    context: ci/prow/e2e-aws-metrics
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -172,10 +165,10 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-hypershift-release-4.13-e2e-aws-nested
+    name: pull-ci-openshift-priv-hypershift-release-4.13-e2e-aws-metrics
+    optional: true
     path_alias: github.com/openshift/hypershift
-    rerun_command: /test e2e-aws-nested
-    skip_if_only_changed: (^(docs|examples|enhancements)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
+    rerun_command: /test e2e-aws-metrics
     spec:
       containers:
       - args:
@@ -184,7 +177,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-nested
+        - --target=e2e-aws-metrics
         command:
         - ci-operator
         image: ci-operator:latest
@@ -220,7 +213,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-nested,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-metrics,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10-presubmits.yaml
index 3a8b3bfbdff86..2aac519dd6377 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver-operator/openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/ibm-vpc-block-csi-driver-operator:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.10$
+    - ^release-4\.10-
+    cluster: build01
+    context: ci/prow/e2e-ibmcloud-csi
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: ibmcloud
+      ci-operator.openshift.io/cloud-cluster-profile: ibmcloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ibm-vpc-block-csi-driver-operator-release-4.10-e2e-ibmcloud-csi
+    optional: true
+    path_alias: github.com/openshift/ibm-vpc-block-csi-driver-operator
+    rerun_command: /test e2e-ibmcloud-csi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-ibmcloud-csi-cluster-profile
+        - --target=e2e-ibmcloud-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-ibmcloud-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-ibmcloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-ibmcloud-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10-presubmits.yaml
index e115f04c7e102..303e7e71801f0 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.10-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/ibm-vpc-block-csi-driver:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.10$
+    - ^release-4\.10-
+    cluster: build01
+    context: ci/prow/e2e-ibmcloud-csi
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: ibmcloud
+      ci-operator.openshift.io/cloud-cluster-profile: ibmcloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ibm-vpc-block-csi-driver-release-4.10-e2e-ibmcloud-csi
+    optional: true
+    path_alias: sigs.k8s.io/ibm-vpc-block-csi-driver
+    rerun_command: /test e2e-ibmcloud-csi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-ibmcloud-csi-cluster-profile
+        - --target=e2e-ibmcloud-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-ibmcloud-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-ibmcloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-ibmcloud-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11-presubmits.yaml
index f5ee0c19ab715..c62743f7202d3 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-block-csi-driver/openshift-priv-ibm-vpc-block-csi-driver-release-4.11-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/ibm-vpc-block-csi-driver:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.11$
+    - ^release-4\.11-
+    cluster: build01
+    context: ci/prow/e2e-ibmcloud-csi
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: ibmcloud
+      ci-operator.openshift.io/cloud-cluster-profile: ibmcloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ibm-vpc-block-csi-driver-release-4.11-e2e-ibmcloud-csi
+    optional: true
+    path_alias: sigs.k8s.io/ibm-vpc-block-csi-driver
+    rerun_command: /test e2e-ibmcloud-csi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-ibmcloud-csi-cluster-profile
+        - --target=e2e-ibmcloud-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-ibmcloud-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-ibmcloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-ibmcloud-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-postsubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-postsubmits.yaml
index 5f6282a340667..fc9905b1b957c 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-postsubmits.yaml
@@ -7,7 +7,9 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-presubmits.yaml
index 87c657c5dc54b..0e3216b8fdc20 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.10-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/ibm-vpc-node-label-updater:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.10$
+    - ^release-4\.10-
+    cluster: build01
+    context: ci/prow/e2e-ibmcloud-csi
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: ibmcloud
+      ci-operator.openshift.io/cloud-cluster-profile: ibmcloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ibm-vpc-node-label-updater-release-4.10-e2e-ibmcloud-csi
+    optional: true
+    path_alias: github.com/openshift/ibm-vpc-node-label-updater
+    rerun_command: /test e2e-ibmcloud-csi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-ibmcloud-csi-cluster-profile
+        - --target=e2e-ibmcloud-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-ibmcloud-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-ibmcloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-ibmcloud-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -9,7 +92,9 @@ presubmits:
     context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -48,9 +133,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -67,7 +149,9 @@ presubmits:
     context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -106,9 +190,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-postsubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-postsubmits.yaml
index 0df9506b761f0..c6bbb7befe08b 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-postsubmits.yaml
@@ -7,7 +7,9 @@ postsubmits:
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-presubmits.yaml
index 51120738cc602..a7d556afda571 100644
--- a/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ibm-vpc-node-label-updater/openshift-priv-ibm-vpc-node-label-updater-release-4.11-presubmits.yaml
@@ -1,5 +1,88 @@
 presubmits:
   openshift-priv/ibm-vpc-node-label-updater:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.11$
+    - ^release-4\.11-
+    cluster: build01
+    context: ci/prow/e2e-ibmcloud-csi
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: ibmcloud
+      ci-operator.openshift.io/cloud-cluster-profile: ibmcloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ibm-vpc-node-label-updater-release-4.11-e2e-ibmcloud-csi
+    optional: true
+    path_alias: github.com/openshift/ibm-vpc-node-label-updater
+    rerun_command: /test e2e-ibmcloud-csi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-ibmcloud-csi-cluster-profile
+        - --target=e2e-ibmcloud-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-ibmcloud-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-ibmcloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-ibmcloud-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -9,7 +92,9 @@ presubmits:
     context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -48,9 +133,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
@@ -67,7 +149,9 @@ presubmits:
     context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
@@ -106,9 +190,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main-presubmits.yaml
index 2b9c0c2217510..18d97204da796 100644
--- a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-main-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-customization-controller-main-e2e-metal-ipi
+    name: pull-ci-openshift-priv-image-customization-controller-main-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/image-customization-controller
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12-presubmits.yaml
index aa4acd29b0064..b8ef8d510b79b 100644
--- a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-customization-controller-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-image-customization-controller-release-4.12-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/image-customization-controller
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13-presubmits.yaml
index 8ca0f99efcdfc..593a15a63963c 100644
--- a/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-customization-controller-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-image-customization-controller-release-4.13-e2e-metal-ipi-sdn-bm
     path_alias: github.com/openshift/image-customization-controller
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-master-presubmits.yaml
index 2907c8cbf8ca1..3ff22a7a9195e 100644
--- a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-master-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-master-e2e-aws
+    name: pull-ci-openshift-priv-image-registry-master-e2e-aws-image-registry
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-image-registry
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +165,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-master-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-image-registry-master-e2e-aws-ovn
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws-image-registry
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12-presubmits.yaml
index 8e5c3361ceb7b..00394b87cdb71 100644
--- a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.12-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-image-registry-release-4.12-e2e-aws-image-registry
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-image-registry
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +165,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-release-4.12-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-image-registry-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws-image-registry
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13-presubmits.yaml
index 3775fd4e1b483..a738f3da5f499 100644
--- a/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/image-registry/openshift-priv-image-registry-release-4.13-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,9 +101,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-image-registry-release-4.13-e2e-aws-image-registry
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-image-registry
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,14 +165,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -184,9 +184,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-image-registry-release-4.13-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-image-registry-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/image-registry
-    rerun_command: /test e2e-aws-image-registry
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -248,7 +248,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master-presubmits.yaml
index 56096d0d08065..4f2be604b7082 100644
--- a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-master-presubmits.yaml
@@ -1,5 +1,63 @@
 presubmits:
   openshift-priv/ingress-node-firewall:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/ci-index
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-master-ci-index
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ci-index
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=ci-index
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -58,6 +116,147 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/ingress-node-firewall-e2e-metal-ipi
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-master-ingress-node-firewall-e2e-metal-ipi
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ingress-node-firewall-e2e-metal-ipi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+        - --target=ingress-node-firewall-e2e-metal-ipi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ingress-node-firewall-e2e-metal-ipi,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-master-lint
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -116,3 +315,61 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )test-fmt,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/unit-test
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-master-unit-test
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test unit-test
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit-test
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit-test,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12-presubmits.yaml
index 761e17c572dba..aa9cad807da50 100644
--- a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.12-presubmits.yaml
@@ -1,5 +1,63 @@
 presubmits:
   openshift-priv/ingress-node-firewall:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/ci-index
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.12-ci-index
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ci-index
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=ci-index
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -58,6 +116,147 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/ingress-node-firewall-e2e-metal-ipi
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.12-ingress-node-firewall-e2e-metal-ipi
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ingress-node-firewall-e2e-metal-ipi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+        - --target=ingress-node-firewall-e2e-metal-ipi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ingress-node-firewall-e2e-metal-ipi,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.12-lint
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -116,3 +315,61 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )test-fmt,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/unit-test
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.12-unit-test
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test unit-test
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit-test
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit-test,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13-presubmits.yaml
index 14131b29baa03..24b4f32bcaa8b 100644
--- a/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ingress-node-firewall/openshift-priv-ingress-node-firewall-release-4.13-presubmits.yaml
@@ -1,5 +1,63 @@
 presubmits:
   openshift-priv/ingress-node-firewall:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/ci-index
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.13-ci-index
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ci-index
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=ci-index
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -58,6 +116,147 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/ingress-node-firewall-e2e-metal-ipi
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.13-ingress-node-firewall-e2e-metal-ipi
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test ingress-node-firewall-e2e-metal-ipi
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+        - --target=ingress-node-firewall-e2e-metal-ipi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/ingress-node-firewall-e2e-metal-ipi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ingress-node-firewall-e2e-metal-ipi,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.13-lint
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -116,3 +315,61 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )test-fmt,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/unit-test
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-ingress-node-firewall-release-4.13-unit-test
+    path_alias: github.com/openshift/ingress-node-firewall
+    rerun_command: /test unit-test
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit-test
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: github-credentials-openshift-ci-robot-private-git-cloner
+        secret:
+          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit-test,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main-presubmits.yaml
index 2215a6792e43b..5bbd0ca335f2f 100644
--- a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-main-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-agent-image-main-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-agent-image-main-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-agent-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12-presubmits.yaml
index 239e2a6918145..91e846d30f029 100644
--- a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-agent-image-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-agent-image-release-4.12-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-agent-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13-presubmits.yaml
index c0e6c0e022288..383bbb94b41f0 100644
--- a/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-agent-image/openshift-priv-ironic-agent-image-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-agent-image-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-agent-image-release-4.13-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-agent-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-master-presubmits.yaml
index 05bdd988e45b7..1034699d74b76 100644
--- a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-master-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-image-master-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12-presubmits.yaml
index 0ca9e134d1cd4..fc1e572d76291 100644
--- a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-image-release-4.12-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13-presubmits.yaml
index 5060bb7401146..cbc05a18c5c6f 100644
--- a/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-image/openshift-priv-ironic-image-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-image-release-4.13-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-image
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master-presubmits.yaml
index 064ad5b843aa9..1356d5ed0e2f0 100644
--- a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-master-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-ipa-downloader-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-ipa-downloader-master-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-ipa-downloader
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12-presubmits.yaml
index 20b71c6cc2d95..f9fa81ffff090 100644
--- a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-ipa-downloader-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-ipa-downloader-release-4.12-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-ipa-downloader
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13-presubmits.yaml
index d757737937564..8bfe9714d4253 100644
--- a/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-ipa-downloader/openshift-priv-ironic-ipa-downloader-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-ipa-downloader-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-ipa-downloader-release-4.13-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-ipa-downloader
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master-presubmits.yaml
index 2467d5f83073d..a0413e59437a8 100644
--- a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-master-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-static-ip-manager-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-static-ip-manager-master-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-static-ip-manager
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12-presubmits.yaml
index aaab58c6b3a7e..3c1288ab8d3da 100644
--- a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.12-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-static-ip-manager-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-static-ip-manager-release-4.12-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-static-ip-manager
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13-presubmits.yaml
index bdd0a8c24c8f0..6ab43d2eea137 100644
--- a/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ironic-static-ip-manager/openshift-priv-ironic-static-ip-manager-release-4.13-presubmits.yaml
@@ -5,8 +5,8 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -16,11 +16,12 @@ presubmits:
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-static-ip-manager-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-ironic-static-ip-manager-release-4.13-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-static-ip-manager
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +83,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master-presubmits.yaml
index ee6fee84a616f..ea71ce630d88a 100644
--- a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-master-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-k8s-prometheus-adapter-master-e2e-aws
+    name: pull-ci-openshift-priv-k8s-prometheus-adapter-master-e2e-aws-ovn
     path_alias: github.com/directxman12/k8s-prometheus-adapter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12-presubmits.yaml
index 4993211c50a0b..2bfcb0b622a41 100644
--- a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.12-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-k8s-prometheus-adapter-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-k8s-prometheus-adapter-release-4.12-e2e-aws-ovn
     path_alias: github.com/directxman12/k8s-prometheus-adapter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13-presubmits.yaml
index 55ae1222fc087..508e8966dd538 100644
--- a/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.13-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-k8s-prometheus-adapter-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-k8s-prometheus-adapter-release-4.13-e2e-aws-ovn
     path_alias: github.com/directxman12/k8s-prometheus-adapter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master-presubmits.yaml
index 3e3715f820247..97b8adbbd61cb 100644
--- a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-kube-rbac-proxy-master-e2e-aws
+    name: pull-ci-openshift-priv-kube-rbac-proxy-master-e2e-aws-ovn
     path_alias: github.com/openshift/kube-rbac-proxy
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12-presubmits.yaml
index e691c485dba18..9500fa4749b81 100644
--- a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-kube-rbac-proxy-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-kube-rbac-proxy-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/kube-rbac-proxy
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13-presubmits.yaml
index 9e61716f8f151..dfdc376805132 100644
--- a/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-kube-rbac-proxy-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-kube-rbac-proxy-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/kube-rbac-proxy
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master-presubmits.yaml
index 42ccee3dd6192..90e20ad6b5086 100644
--- a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-master-presubmits.yaml
@@ -1,5 +1,62 @@
 presubmits:
   openshift-priv/kubernetes-nmstate:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/check-generate-bundle
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-kubernetes-nmstate-master-check-generate-bundle
+    path_alias: github.com/openshift/kubernetes-nmstate
+    rerun_command: /test check-generate-bundle
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=check-generate-bundle
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )check-generate-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12-presubmits.yaml
index 802cffc18d309..ce944e6f6bf2c 100644
--- a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.12-presubmits.yaml
@@ -1,5 +1,62 @@
 presubmits:
   openshift-priv/kubernetes-nmstate:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/check-generate-bundle
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-kubernetes-nmstate-release-4.12-check-generate-bundle
+    path_alias: github.com/openshift/kubernetes-nmstate
+    rerun_command: /test check-generate-bundle
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=check-generate-bundle
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )check-generate-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13-presubmits.yaml
index b61577152100a..525fec5012eb3 100644
--- a/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/kubernetes-nmstate/openshift-priv-kubernetes-nmstate-release-4.13-presubmits.yaml
@@ -1,5 +1,62 @@
 presubmits:
   openshift-priv/kubernetes-nmstate:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/check-generate-bundle
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-kubernetes-nmstate-release-4.13-check-generate-bundle
+    path_alias: github.com/openshift/kubernetes-nmstate
+    rerun_command: /test check-generate-bundle
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --target=check-generate-bundle
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )check-generate-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master-presubmits.yaml
index d5107e655d47d..437b31e6b60d3 100644
--- a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +83,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +102,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-operator
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -115,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -166,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-operator-tech-preview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -185,9 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-operator
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-operator-tech-preview
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-operator-tech-preview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - --target=e2e-aws-operator-tech-preview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-operator-tech-preview
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-operator-tech-preview
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator-tech-preview
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
-        - --target=e2e-aws-operator-tech-preview
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,7 +333,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -423,7 +423,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -435,10 +435,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-azure
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -449,8 +449,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -466,7 +466,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -500,14 +500,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -519,10 +519,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-azure-operator
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -533,8 +533,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -550,7 +550,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -584,14 +584,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -603,10 +603,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-gcp
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-gcp-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -617,8 +617,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
+        - --target=e2e-gcp-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -634,7 +634,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -672,14 +672,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-operator
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -691,10 +691,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-gcp-operator
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-gcp-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp-operator
+    rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -705,8 +705,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
-        - --target=e2e-gcp-operator
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -722,7 +722,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -760,7 +760,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -855,7 +855,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -867,10 +867,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi-ovn-dualstack
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -881,8 +881,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -898,7 +898,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -932,14 +932,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -951,10 +951,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi-ovn-ipv6
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -965,8 +965,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -982,7 +982,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1016,14 +1016,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1035,10 +1035,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-machine-api-operator-master-e2e-metal-ipi-sdn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -1049,8 +1049,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1066,7 +1066,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1100,7 +1100,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12-presubmits.yaml
index 12adf04c8f795..ff00518c9c59a 100644
--- a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +83,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +102,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-operator
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -115,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -166,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-operator-tech-preview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -185,9 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-operator-tech-preview
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-operator-tech-preview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - --target=e2e-aws-operator-tech-preview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-operator-tech-preview
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-operator-tech-preview
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator-tech-preview
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
-        - --target=e2e-aws-operator-tech-preview
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,7 +333,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -423,7 +423,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -435,10 +435,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -449,8 +449,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -466,7 +466,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -500,14 +500,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -519,10 +519,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-azure-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -533,8 +533,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -550,7 +550,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -584,14 +584,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -603,10 +603,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-gcp-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -617,8 +617,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
+        - --target=e2e-gcp-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -634,7 +634,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -672,14 +672,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-operator
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -691,10 +691,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-gcp-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-gcp-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp-operator
+    rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -705,8 +705,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
-        - --target=e2e-gcp-operator
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -722,7 +722,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -760,7 +760,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -855,7 +855,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -867,10 +867,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -881,8 +881,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -898,7 +898,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -932,14 +932,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -951,10 +951,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -965,8 +965,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -982,7 +982,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1016,14 +1016,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1035,10 +1035,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.12-e2e-metal-ipi-sdn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -1049,8 +1049,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1066,7 +1066,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1100,7 +1100,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13-presubmits.yaml
index 0782b747738da..75260f0227d6f 100644
--- a/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-disruptive
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -31,8 +32,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +49,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +83,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +102,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-operator
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -115,8 +115,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -132,7 +132,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -166,14 +166,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-operator-tech-preview
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -185,9 +185,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-operator-tech-preview
+    optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator
+    rerun_command: /test e2e-aws-operator-tech-preview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -198,8 +199,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - --target=e2e-aws-operator-tech-preview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -215,7 +216,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -249,14 +250,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-operator-tech-preview
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -268,10 +269,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-operator-tech-preview
-    optional: true
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-aws-operator-tech-preview
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -282,8 +282,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
-        - --target=e2e-aws-operator-tech-preview
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -299,7 +299,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -333,7 +333,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -423,7 +423,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -435,10 +435,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-azure-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -449,8 +449,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -466,7 +466,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -500,14 +500,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -519,10 +519,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-azure-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-azure-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -533,8 +533,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -550,7 +550,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -584,14 +584,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-operator
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -603,10 +603,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-gcp-operator
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -617,8 +617,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
+        - --target=e2e-gcp-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -634,7 +634,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -672,14 +672,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-operator
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -691,10 +691,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-gcp-operator
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-gcp-ovn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-gcp-operator
+    rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -705,8 +705,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
-        - --target=e2e-gcp-operator
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -722,7 +722,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -760,7 +760,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -855,7 +855,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -867,10 +867,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -881,8 +881,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -898,7 +898,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -932,14 +932,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -951,10 +951,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -965,8 +965,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -982,7 +982,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1016,14 +1016,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1035,10 +1035,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-machine-api-operator-release-4.13-e2e-metal-ipi-sdn
     optional: true
     path_alias: github.com/openshift/machine-api-operator
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -1049,8 +1049,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1066,7 +1066,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1100,7 +1100,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-master-presubmits.yaml
index 2ee6fb2320ff6..3ca670628ce40 100644
--- a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-network-tools-master-e2e-aws
+    name: pull-ci-openshift-priv-network-tools-master-e2e-aws-ovn
     path_alias: github.com/openshift/network-tools
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12-presubmits.yaml
index 146d72ff9e076..82f19c323c3ea 100644
--- a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-network-tools-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-network-tools-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/network-tools
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13-presubmits.yaml
index 12ec54567fada..233870f52f227 100644
--- a/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/network-tools/openshift-priv-network-tools-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-network-tools-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-network-tools-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/network-tools
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -81,7 +81,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-master-presubmits.yaml
index 9f07a724be80a..aafa8b6f30b99 100644
--- a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-master-presubmits.yaml
@@ -140,12 +140,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-master-e2e-aws
+    name: pull-ci-openshift-priv-oc-master-e2e-aws-builds
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
     spec:
       containers:
       - args:
@@ -169,8 +170,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,14 +221,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -239,10 +240,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-master-e2e-aws-builds
+    name: pull-ci-openshift-priv-oc-master-e2e-aws-ovn
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -252,8 +252,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -269,7 +269,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -303,7 +303,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.12-presubmits.yaml
index 7561e3f9c52b8..7f7e46111111a 100644
--- a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.12-presubmits.yaml
@@ -140,12 +140,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-oc-release-4.12-e2e-aws-builds
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
     spec:
       containers:
       - args:
@@ -169,8 +170,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,14 +221,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -239,10 +240,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-release-4.12-e2e-aws-builds
+    name: pull-ci-openshift-priv-oc-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -252,8 +252,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -269,7 +269,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -303,7 +303,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.13-presubmits.yaml
index 33320ce93592b..b868f12788783 100644
--- a/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/oc/openshift-priv-oc-release-4.13-presubmits.yaml
@@ -140,12 +140,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-oc-release-4.13-e2e-aws-builds
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
     spec:
       containers:
       - args:
@@ -169,8 +170,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,14 +221,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -239,10 +240,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-oc-release-4.13-e2e-aws-builds
+    name: pull-ci-openshift-priv-oc-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/oc
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -252,8 +252,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -269,7 +269,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -303,7 +303,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master-presubmits.yaml
index bd1415cc96a0d..a99110feb559e 100644
--- a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-master-e2e-aws
+    name: pull-ci-openshift-priv-openshift-controller-manager-master-e2e-aws-builds
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/build)
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-master-e2e-aws-builds
+    name: pull-ci-openshift-priv-openshift-controller-manager-master-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/build)
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12-presubmits.yaml
index 6f3a50be140a9..dcae878cae489 100644
--- a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.12-e2e-aws-builds
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/build)
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.12-e2e-aws-builds
+    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/build)
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13-presubmits.yaml
index 6349bb0f0a1d3..3e3fd424e69b6 100644
--- a/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.13-e2e-aws-builds
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/build)
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,14 +82,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -101,10 +101,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.13-e2e-aws-builds
+    name: pull-ci-openshift-priv-openshift-controller-manager-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-controller-manager
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/build)
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -114,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -131,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master-presubmits.yaml
index 654a9fe6bb8db..eb9483abca473 100644
--- a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-master-presubmits.yaml
@@ -145,7 +145,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-state-metrics-master-e2e-aws
+    name: pull-ci-openshift-priv-openshift-state-metrics-master-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-state-metrics
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -169,8 +169,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +186,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,7 +220,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12-presubmits.yaml
index 3f29c525640f5..b81324678e989 100644
--- a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.12-presubmits.yaml
@@ -145,7 +145,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-state-metrics-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-openshift-state-metrics-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-state-metrics
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -169,8 +169,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +186,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,7 +220,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13-presubmits.yaml
index eb34481788f53..b0b620c96ab21 100644
--- a/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/openshift-state-metrics/openshift-priv-openshift-state-metrics-release-4.13-presubmits.yaml
@@ -145,7 +145,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -157,9 +157,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-openshift-state-metrics-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-openshift-state-metrics-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/openshift-state-metrics
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -169,8 +169,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -186,7 +186,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -220,7 +220,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master-presubmits.yaml
index a7ffe35e27659..b1d241c069724 100644
--- a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-console-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp
+    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-console-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-console-olm
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
+        - --target=e2e-gcp-console-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -85,14 +85,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-console-olm
+    context: ci/prow/e2e-gcp-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -104,9 +104,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-console-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-console-olm
+    rerun_command: /test e2e-gcp-olm
     spec:
       containers:
       - args:
@@ -116,8 +116,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
-        - --target=e2e-gcp-console-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
+        - --target=e2e-gcp-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -133,7 +133,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -171,14 +171,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm
+    context: ci/prow/e2e-gcp-olm-flaky
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -190,9 +190,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-olm-flaky
+    optional: true
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm
+    rerun_command: /test e2e-gcp-olm-flaky
     spec:
       containers:
       - args:
@@ -202,8 +203,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
-        - --target=e2e-gcp-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - --target=e2e-gcp-olm-flaky
         command:
         - ci-operator
         image: ci-operator:latest
@@ -219,7 +220,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -257,14 +258,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm-flaky
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -276,10 +277,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-olm-flaky
-    optional: true
+    name: pull-ci-openshift-priv-operator-framework-olm-master-e2e-gcp-ovn
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm-flaky
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -289,8 +289,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
-        - --target=e2e-gcp-olm-flaky
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -306,7 +306,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -344,7 +344,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12-presubmits.yaml
index 4c36a18ec32d8..06fa3c3511473 100644
--- a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-console-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-console-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-console-olm
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
+        - --target=e2e-gcp-console-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -85,14 +85,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-console-olm
+    context: ci/prow/e2e-gcp-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -104,9 +104,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-console-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-console-olm
+    rerun_command: /test e2e-gcp-olm
     spec:
       containers:
       - args:
@@ -116,8 +116,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
-        - --target=e2e-gcp-console-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
+        - --target=e2e-gcp-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -133,7 +133,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -171,14 +171,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm
+    context: ci/prow/e2e-gcp-olm-flaky
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -190,9 +190,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-olm-flaky
+    optional: true
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm
+    rerun_command: /test e2e-gcp-olm-flaky
     spec:
       containers:
       - args:
@@ -202,8 +203,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
-        - --target=e2e-gcp-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - --target=e2e-gcp-olm-flaky
         command:
         - ci-operator
         image: ci-operator:latest
@@ -219,7 +220,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -257,14 +258,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm-flaky
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -276,10 +277,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-olm-flaky
-    optional: true
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.12-e2e-gcp-ovn
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm-flaky
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -289,8 +289,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
-        - --target=e2e-gcp-olm-flaky
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -306,7 +306,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -344,7 +344,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13-presubmits.yaml
index 243e6d20895c7..00e6cd8fbf502 100644
--- a/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-console-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,9 +18,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-console-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-console-olm
     spec:
       containers:
       - args:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
+        - --target=e2e-gcp-console-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -85,14 +85,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-console-olm
+    context: ci/prow/e2e-gcp-olm
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -104,9 +104,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-console-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-olm
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-console-olm
+    rerun_command: /test e2e-gcp-olm
     spec:
       containers:
       - args:
@@ -116,8 +116,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
-        - --target=e2e-gcp-console-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
+        - --target=e2e-gcp-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -133,7 +133,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -171,14 +171,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm
+    context: ci/prow/e2e-gcp-olm-flaky
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -190,9 +190,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-olm
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-olm-flaky
+    optional: true
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm
+    rerun_command: /test e2e-gcp-olm-flaky
     spec:
       containers:
       - args:
@@ -202,8 +203,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
-        - --target=e2e-gcp-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - --target=e2e-gcp-olm-flaky
         command:
         - ci-operator
         image: ci-operator:latest
@@ -219,7 +220,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -257,14 +258,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-olm-flaky
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -276,10 +277,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-olm-flaky
-    optional: true
+    name: pull-ci-openshift-priv-operator-framework-olm-release-4.13-e2e-gcp-ovn
     path_alias: github.com/openshift/operator-framework-olm
-    rerun_command: /test e2e-gcp-olm-flaky
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -289,8 +289,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
-        - --target=e2e-gcp-olm-flaky
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -306,7 +306,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -344,7 +344,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml
index 2c484d5fd4aff..ae1d848128f7d 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-agnostic-cmd
+    context: ci/prow/e2e-agnostic-ovn-cmd
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-agnostic-cmd
+    name: pull-ci-openshift-priv-origin-master-e2e-agnostic-ovn-cmd
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-agnostic-cmd
+    rerun_command: /test e2e-agnostic-ovn-cmd
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-cmd-cluster-profile
-        - --target=e2e-agnostic-cmd
+        - --secret-dir=/usr/local/e2e-agnostic-ovn-cmd-cluster-profile
+        - --target=e2e-agnostic-ovn-cmd
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-cmd-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-ovn-cmd-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-ovn-cmd,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -172,7 +172,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -181,13 +181,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-cgroupsv2
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-csi
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -241,21 +241,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-csi-migration
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -264,13 +264,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-csi
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-csi-migration
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-csi-migration
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
+        - --target=e2e-aws-csi-migration
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -324,21 +324,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-csi-migration
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,13 +347,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-csi-migration
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi-migration
+    rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
-        - --target=e2e-aws-csi-migration
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -407,21 +407,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -433,10 +433,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-image-registry
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-image-registry
+    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
     spec:
       containers:
       - args:
@@ -446,8 +446,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +463,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,14 +497,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-fips
+    context: ci/prow/e2e-aws-jenkins
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -516,9 +516,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-fips
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-jenkins
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-fips
+    rerun_command: /test e2e-aws-jenkins
+    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
     spec:
       containers:
       - args:
@@ -528,8 +529,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile
-        - --target=e2e-aws-fips
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         command:
         - ci-operator
         image: ci-operator:latest
@@ -545,7 +546,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-fips-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -579,14 +580,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-multitenant
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -598,10 +599,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-multitenant
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-image-registry
-    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
+    rerun_command: /test e2e-aws-multitenant
     spec:
       containers:
       - args:
@@ -611,8 +612,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
+        - --target=e2e-aws-multitenant
         command:
         - ci-operator
         image: ci-operator:latest
@@ -628,7 +629,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -662,14 +663,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-jenkins
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -681,10 +682,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-jenkins
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-jenkins
-    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -694,8 +695,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -711,7 +712,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -745,14 +746,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-multitenant
+    context: ci/prow/e2e-aws-ovn-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -761,13 +762,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-multitenant
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-cgroupsv2
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-multitenant
+    rerun_command: /test e2e-aws-ovn-cgroupsv2
     spec:
       containers:
       - args:
@@ -777,8 +778,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
-        - --target=e2e-aws-multitenant
+        - --secret-dir=/usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
+        - --target=e2e-aws-ovn-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -794,7 +795,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -821,21 +822,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-ovn
+    context: ci/prow/e2e-aws-ovn-fips
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -847,10 +848,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn
-    optional: true
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-fips
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn-fips
     spec:
       containers:
       - args:
@@ -860,8 +860,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
-        - --target=e2e-aws-ovn
+        - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile
+        - --target=e2e-aws-ovn-fips
         command:
         - ci-operator
         image: ci-operator:latest
@@ -877,7 +877,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -911,14 +911,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-proxy
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -927,13 +927,12 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-proxy
-    optional: true
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-serial
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-proxy
+    rerun_command: /test e2e-aws-ovn-serial
     spec:
       containers:
       - args:
@@ -943,8 +942,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
-        - --target=e2e-aws-proxy
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -960,7 +959,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -987,21 +986,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1013,9 +1012,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-serial
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-single-node
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-serial
+    rerun_command: /test e2e-aws-ovn-single-node
     spec:
       containers:
       - args:
@@ -1025,8 +1025,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile
+        - --target=e2e-aws-ovn-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1042,7 +1042,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1076,14 +1076,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node
+    context: ci/prow/e2e-aws-ovn-single-node-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1095,10 +1095,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-single-node
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-single-node-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node
+    rerun_command: /test e2e-aws-ovn-single-node-serial
     spec:
       containers:
       - args:
@@ -1108,8 +1108,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile
-        - --target=e2e-aws-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
+        - --target=e2e-aws-ovn-single-node-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1125,7 +1125,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1159,14 +1159,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-serial
+    context: ci/prow/e2e-aws-ovn-single-node-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1178,10 +1178,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-single-node-serial
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-ovn-single-node-upgrade
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-serial
+    rerun_command: /test e2e-aws-ovn-single-node-upgrade
     spec:
       containers:
       - args:
@@ -1191,8 +1191,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-serial-cluster-profile
-        - --target=e2e-aws-single-node-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-single-node-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1208,7 +1208,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1242,14 +1242,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-upgrade
+    context: ci/prow/e2e-aws-proxy
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1258,13 +1258,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-aws-single-node-upgrade
+    name: pull-ci-openshift-priv-origin-master-e2e-aws-proxy
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-upgrade
+    rerun_command: /test e2e-aws-proxy
     spec:
       containers:
       - args:
@@ -1274,8 +1274,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-upgrade-cluster-profile
-        - --target=e2e-aws-single-node-upgrade
+        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
+        - --target=e2e-aws-proxy
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1291,7 +1291,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1318,14 +1318,14 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1493,12 +1493,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1510,9 +1510,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-builds
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-builds
+    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1522,8 +1523,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
+        - --target=e2e-gcp-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1539,7 +1540,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1577,14 +1578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-builds
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1596,10 +1597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-builds
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-builds
-    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -1609,8 +1610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
-        - --target=e2e-gcp-builds
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1626,7 +1627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1664,14 +1665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1683,10 +1684,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-csi
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-disruptive
     spec:
       containers:
       - args:
@@ -1696,8 +1697,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
+        - --target=e2e-gcp-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1713,7 +1714,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1751,14 +1752,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-disruptive
+    context: ci/prow/e2e-gcp-fips-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1767,13 +1768,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-disruptive
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-fips-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-disruptive
+    rerun_command: /test e2e-gcp-fips-serial
     spec:
       containers:
       - args:
@@ -1783,8 +1784,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
-        - --target=e2e-gcp-disruptive
+        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
+        - --target=e2e-gcp-fips-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1800,7 +1801,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1829,23 +1830,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
+              name: cluster-secrets-gcp
           - configMap:
-              name: cluster-profile-gcp-openshift-gce-devel-ci-2
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-fips-serial
+    context: ci/prow/e2e-gcp-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1854,13 +1855,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-fips-serial
-    optional: true
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-image-ecosystem
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-fips-serial
+    rerun_command: /test e2e-gcp-image-ecosystem
+    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1870,8 +1871,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
-        - --target=e2e-gcp-fips-serial
+        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - --target=e2e-gcp-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1887,7 +1888,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1916,23 +1917,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp
+              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
           - configMap:
-              name: cluster-profile-gcp
+              name: cluster-profile-gcp-openshift-gce-devel-ci-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-image-ecosystem
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1944,10 +1945,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-image-ecosystem
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-ovn
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-image-ecosystem
-    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -1957,8 +1957,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
-        - --target=e2e-gcp-image-ecosystem
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1974,7 +1974,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2012,7 +2012,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2106,7 +2106,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-gcp-upgrade
+    context: ci/prow/e2e-gcp-ovn-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -2118,9 +2118,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-master-e2e-gcp-upgrade
+    name: pull-ci-openshift-priv-origin-master-e2e-gcp-ovn-upgrade
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-upgrade
+    rerun_command: /test e2e-gcp-ovn-upgrade
     spec:
       containers:
       - args:
@@ -2130,8 +2130,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-gcp-ovn-upgrade-cluster-profile
+        - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -2147,7 +2147,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2185,7 +2185,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.12-presubmits.yaml
index 1edfe0336f0a5..7ccd85ea8c787 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.12-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-agnostic-cmd
+    context: ci/prow/e2e-agnostic-ovn-cmd
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-agnostic-cmd
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-agnostic-ovn-cmd
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-agnostic-cmd
+    rerun_command: /test e2e-agnostic-ovn-cmd
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-cmd-cluster-profile
-        - --target=e2e-agnostic-cmd
+        - --secret-dir=/usr/local/e2e-agnostic-ovn-cmd-cluster-profile
+        - --target=e2e-agnostic-ovn-cmd
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-cmd-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-ovn-cmd-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-ovn-cmd,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -172,7 +172,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -181,13 +181,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-cgroupsv2
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-csi
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -241,21 +241,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-csi-migration
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -264,13 +264,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-csi
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-csi-migration
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-csi-migration
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
+        - --target=e2e-aws-csi-migration
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -324,21 +324,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-csi-migration
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,13 +347,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-csi-migration
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi-migration
+    rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
-        - --target=e2e-aws-csi-migration
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -407,21 +407,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -433,10 +433,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-image-registry
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-image-registry
+    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
     spec:
       containers:
       - args:
@@ -446,8 +446,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +463,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,14 +497,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-fips
+    context: ci/prow/e2e-aws-jenkins
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -516,9 +516,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-fips
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-jenkins
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-fips
+    rerun_command: /test e2e-aws-jenkins
+    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
     spec:
       containers:
       - args:
@@ -528,8 +529,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile
-        - --target=e2e-aws-fips
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         command:
         - ci-operator
         image: ci-operator:latest
@@ -545,7 +546,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-fips-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -579,14 +580,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-multitenant
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -598,10 +599,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-multitenant
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-image-registry
-    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
+    rerun_command: /test e2e-aws-multitenant
     spec:
       containers:
       - args:
@@ -611,8 +612,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
+        - --target=e2e-aws-multitenant
         command:
         - ci-operator
         image: ci-operator:latest
@@ -628,7 +629,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -662,14 +663,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-jenkins
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -681,10 +682,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-jenkins
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-jenkins
-    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -694,8 +695,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -711,7 +712,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -745,14 +746,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-multitenant
+    context: ci/prow/e2e-aws-ovn-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -761,13 +762,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-multitenant
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-cgroupsv2
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-multitenant
+    rerun_command: /test e2e-aws-ovn-cgroupsv2
     spec:
       containers:
       - args:
@@ -777,8 +778,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
-        - --target=e2e-aws-multitenant
+        - --secret-dir=/usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
+        - --target=e2e-aws-ovn-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -794,7 +795,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -821,21 +822,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-ovn
+    context: ci/prow/e2e-aws-ovn-fips
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -847,10 +848,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-fips
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn-fips
     spec:
       containers:
       - args:
@@ -860,8 +860,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
-        - --target=e2e-aws-ovn
+        - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile
+        - --target=e2e-aws-ovn-fips
         command:
         - ci-operator
         image: ci-operator:latest
@@ -877,7 +877,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -911,14 +911,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-proxy
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -927,13 +927,12 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-proxy
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-serial
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-proxy
+    rerun_command: /test e2e-aws-ovn-serial
     spec:
       containers:
       - args:
@@ -943,8 +942,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
-        - --target=e2e-aws-proxy
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -960,7 +959,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -987,21 +986,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1013,9 +1012,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-serial
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-single-node
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-serial
+    rerun_command: /test e2e-aws-ovn-single-node
     spec:
       containers:
       - args:
@@ -1025,8 +1025,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile
+        - --target=e2e-aws-ovn-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1042,7 +1042,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1076,14 +1076,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node
+    context: ci/prow/e2e-aws-ovn-single-node-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1095,10 +1095,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-single-node
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-single-node-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node
+    rerun_command: /test e2e-aws-ovn-single-node-serial
     spec:
       containers:
       - args:
@@ -1108,8 +1108,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile
-        - --target=e2e-aws-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
+        - --target=e2e-aws-ovn-single-node-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1125,7 +1125,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1159,14 +1159,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-serial
+    context: ci/prow/e2e-aws-ovn-single-node-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1178,10 +1178,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-single-node-serial
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-ovn-single-node-upgrade
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-serial
+    rerun_command: /test e2e-aws-ovn-single-node-upgrade
     spec:
       containers:
       - args:
@@ -1191,8 +1191,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-serial-cluster-profile
-        - --target=e2e-aws-single-node-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-single-node-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1208,7 +1208,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1242,14 +1242,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-upgrade
+    context: ci/prow/e2e-aws-proxy
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1258,13 +1258,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-single-node-upgrade
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-aws-proxy
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-upgrade
+    rerun_command: /test e2e-aws-proxy
     spec:
       containers:
       - args:
@@ -1274,8 +1274,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-upgrade-cluster-profile
-        - --target=e2e-aws-single-node-upgrade
+        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
+        - --target=e2e-aws-proxy
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1291,7 +1291,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1318,14 +1318,14 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1493,12 +1493,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1510,9 +1510,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-builds
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-builds
+    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1522,8 +1523,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
+        - --target=e2e-gcp-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1539,7 +1540,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1577,14 +1578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-builds
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1596,10 +1597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-builds
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-builds
-    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -1609,8 +1610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
-        - --target=e2e-gcp-builds
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1626,7 +1627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1664,14 +1665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1683,10 +1684,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-csi
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-disruptive
     spec:
       containers:
       - args:
@@ -1696,8 +1697,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
+        - --target=e2e-gcp-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1713,7 +1714,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1751,14 +1752,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-disruptive
+    context: ci/prow/e2e-gcp-fips-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1767,13 +1768,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-disruptive
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-fips-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-disruptive
+    rerun_command: /test e2e-gcp-fips-serial
     spec:
       containers:
       - args:
@@ -1783,8 +1784,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
-        - --target=e2e-gcp-disruptive
+        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
+        - --target=e2e-gcp-fips-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1800,7 +1801,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1829,23 +1830,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
+              name: cluster-secrets-gcp
           - configMap:
-              name: cluster-profile-gcp-openshift-gce-devel-ci-2
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-fips-serial
+    context: ci/prow/e2e-gcp-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1854,13 +1855,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-fips-serial
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-image-ecosystem
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-fips-serial
+    rerun_command: /test e2e-gcp-image-ecosystem
+    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1870,8 +1871,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
-        - --target=e2e-gcp-fips-serial
+        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - --target=e2e-gcp-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1887,7 +1888,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1916,23 +1917,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp
+              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
           - configMap:
-              name: cluster-profile-gcp
+              name: cluster-profile-gcp-openshift-gce-devel-ci-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-image-ecosystem
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1944,10 +1945,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-image-ecosystem
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-ovn
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-image-ecosystem
-    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -1957,8 +1957,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
-        - --target=e2e-gcp-image-ecosystem
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1974,7 +1974,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2012,7 +2012,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2106,7 +2106,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp-upgrade
+    context: ci/prow/e2e-gcp-ovn-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -2118,9 +2118,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-upgrade
+    name: pull-ci-openshift-priv-origin-release-4.12-e2e-gcp-ovn-upgrade
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-upgrade
+    rerun_command: /test e2e-gcp-ovn-upgrade
     spec:
       containers:
       - args:
@@ -2130,8 +2130,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-gcp-ovn-upgrade-cluster-profile
+        - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -2147,7 +2147,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2185,7 +2185,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.13-presubmits.yaml
index fb68b9704bd8a..c0db0a82c22e5 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.13-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-agnostic-cmd
+    context: ci/prow/e2e-agnostic-ovn-cmd
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -18,10 +18,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-agnostic-cmd
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-agnostic-ovn-cmd
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-agnostic-cmd
+    rerun_command: /test e2e-agnostic-ovn-cmd
     spec:
       containers:
       - args:
@@ -31,8 +31,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-cmd-cluster-profile
-        - --target=e2e-agnostic-cmd
+        - --secret-dir=/usr/local/e2e-agnostic-ovn-cmd-cluster-profile
+        - --target=e2e-agnostic-ovn-cmd
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,7 +48,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-cmd-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-ovn-cmd-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -82,7 +82,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-ovn-cmd,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -172,7 +172,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -181,13 +181,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-cgroupsv2
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-csi
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -197,8 +197,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -214,7 +214,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -241,21 +241,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-csi-migration
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -264,13 +264,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-csi
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-csi-migration
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-csi-migration
     spec:
       containers:
       - args:
@@ -280,8 +280,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
+        - --target=e2e-aws-csi-migration
         command:
         - ci-operator
         image: ci-operator:latest
@@ -297,7 +297,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -324,21 +324,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-csi-migration
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -347,13 +347,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-csi-migration
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-csi-migration
+    rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
       - args:
@@ -363,8 +363,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
-        - --target=e2e-aws-csi-migration
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -380,7 +380,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -407,21 +407,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -433,10 +433,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-disruptive
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-image-registry
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-disruptive
+    rerun_command: /test e2e-aws-image-registry
+    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
     spec:
       containers:
       - args:
@@ -446,8 +446,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -463,7 +463,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -497,14 +497,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-fips
+    context: ci/prow/e2e-aws-jenkins
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -516,9 +516,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-fips
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-jenkins
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-fips
+    rerun_command: /test e2e-aws-jenkins
+    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
     spec:
       containers:
       - args:
@@ -528,8 +529,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile
-        - --target=e2e-aws-fips
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         command:
         - ci-operator
         image: ci-operator:latest
@@ -545,7 +546,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-fips-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -579,14 +580,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-multitenant
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -598,10 +599,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-image-registry
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-multitenant
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-image-registry
-    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
+    rerun_command: /test e2e-aws-multitenant
     spec:
       containers:
       - args:
@@ -611,8 +612,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
+        - --target=e2e-aws-multitenant
         command:
         - ci-operator
         image: ci-operator:latest
@@ -628,7 +629,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -662,14 +663,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-jenkins
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -681,10 +682,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-jenkins
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-jenkins
-    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -694,8 +695,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -711,7 +712,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -745,14 +746,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-multitenant
+    context: ci/prow/e2e-aws-ovn-cgroupsv2
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -761,13 +762,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-multitenant
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-cgroupsv2
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-multitenant
+    rerun_command: /test e2e-aws-ovn-cgroupsv2
     spec:
       containers:
       - args:
@@ -777,8 +778,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
-        - --target=e2e-aws-multitenant
+        - --secret-dir=/usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
+        - --target=e2e-aws-ovn-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -794,7 +795,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -821,21 +822,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-ovn
+    context: ci/prow/e2e-aws-ovn-fips
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -847,10 +848,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-fips
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn-fips
     spec:
       containers:
       - args:
@@ -860,8 +860,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
-        - --target=e2e-aws-ovn
+        - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile
+        - --target=e2e-aws-ovn-fips
         command:
         - ci-operator
         image: ci-operator:latest
@@ -877,7 +877,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -911,14 +911,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-proxy
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -927,13 +927,12 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-proxy
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-serial
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-proxy
+    rerun_command: /test e2e-aws-ovn-serial
     spec:
       containers:
       - args:
@@ -943,8 +942,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
-        - --target=e2e-aws-proxy
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -960,7 +959,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -987,21 +986,21 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-single-node
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1013,9 +1012,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-serial
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-single-node
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-serial
+    rerun_command: /test e2e-aws-ovn-single-node
     spec:
       containers:
       - args:
@@ -1025,8 +1025,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile
+        - --target=e2e-aws-ovn-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1042,7 +1042,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1076,14 +1076,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node
+    context: ci/prow/e2e-aws-ovn-single-node-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1095,10 +1095,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-single-node
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-single-node-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node
+    rerun_command: /test e2e-aws-ovn-single-node-serial
     spec:
       containers:
       - args:
@@ -1108,8 +1108,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile
-        - --target=e2e-aws-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
+        - --target=e2e-aws-ovn-single-node-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1125,7 +1125,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1159,14 +1159,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-serial
+    context: ci/prow/e2e-aws-ovn-single-node-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1178,10 +1178,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-single-node-serial
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-ovn-single-node-upgrade
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-serial
+    rerun_command: /test e2e-aws-ovn-single-node-upgrade
     spec:
       containers:
       - args:
@@ -1191,8 +1191,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-serial-cluster-profile
-        - --target=e2e-aws-single-node-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-single-node-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1208,7 +1208,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1242,14 +1242,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-single-node-upgrade
+    context: ci/prow/e2e-aws-proxy
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1258,13 +1258,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-single-node-upgrade
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-aws-proxy
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-aws-single-node-upgrade
+    rerun_command: /test e2e-aws-proxy
     spec:
       containers:
       - args:
@@ -1274,8 +1274,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-upgrade-cluster-profile
-        - --target=e2e-aws-single-node-upgrade
+        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
+        - --target=e2e-aws-proxy
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1291,7 +1291,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1318,14 +1318,14 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1493,12 +1493,12 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-builds
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1510,9 +1510,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-builds
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-builds
+    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1522,8 +1523,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
+        - --target=e2e-gcp-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1539,7 +1540,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1577,14 +1578,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-builds
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1596,10 +1597,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-builds
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-csi
+    optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-builds
-    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -1609,8 +1610,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
-        - --target=e2e-gcp-builds
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1626,7 +1627,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1664,14 +1665,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-disruptive
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1683,10 +1684,10 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-csi
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-disruptive
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-disruptive
     spec:
       containers:
       - args:
@@ -1696,8 +1697,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
+        - --target=e2e-gcp-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1713,7 +1714,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1751,14 +1752,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-disruptive
+    context: ci/prow/e2e-gcp-fips-serial
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1767,13 +1768,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-disruptive
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-fips-serial
     optional: true
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-disruptive
+    rerun_command: /test e2e-gcp-fips-serial
     spec:
       containers:
       - args:
@@ -1783,8 +1784,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
-        - --target=e2e-gcp-disruptive
+        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
+        - --target=e2e-gcp-fips-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1800,7 +1801,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1829,23 +1830,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
+              name: cluster-secrets-gcp
           - configMap:
-              name: cluster-profile-gcp-openshift-gce-devel-ci-2
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-fips-serial
+    context: ci/prow/e2e-gcp-image-ecosystem
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1854,13 +1855,13 @@ presubmits:
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-fips-serial
-    optional: true
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-image-ecosystem
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-fips-serial
+    rerun_command: /test e2e-gcp-image-ecosystem
+    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1870,8 +1871,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
-        - --target=e2e-gcp-fips-serial
+        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - --target=e2e-gcp-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1887,7 +1888,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1916,23 +1917,23 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp
+              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
           - configMap:
-              name: cluster-profile-gcp
+              name: cluster-profile-gcp-openshift-gce-devel-ci-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-image-ecosystem
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -1944,10 +1945,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-image-ecosystem
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-ovn
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-image-ecosystem
-    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -1957,8 +1957,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
-        - --target=e2e-gcp-image-ecosystem
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1974,7 +1974,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2012,7 +2012,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2106,7 +2106,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp-upgrade
+    context: ci/prow/e2e-gcp-ovn-upgrade
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -2118,9 +2118,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-upgrade
+    name: pull-ci-openshift-priv-origin-release-4.13-e2e-gcp-ovn-upgrade
     path_alias: github.com/openshift/origin
-    rerun_command: /test e2e-gcp-upgrade
+    rerun_command: /test e2e-gcp-ovn-upgrade
     spec:
       containers:
       - args:
@@ -2130,8 +2130,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-gcp-ovn-upgrade-cluster-profile
+        - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -2147,7 +2147,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -2185,7 +2185,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-main-presubmits.yaml
index 09d87655bebea..a17aa5b93b591 100644
--- a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-main-presubmits.yaml
@@ -5,21 +5,21 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build02
-    context: ci/prow/e2e
+    cluster: build01
+    context: ci/prow/e2e-techpreview
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-platform-operators-main-e2e
+    name: pull-ci-openshift-priv-platform-operators-main-e2e-techpreview
     optional: true
     path_alias: github.com/openshift/platform-operators
-    rerun_command: /test e2e
+    rerun_command: /test e2e-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-techpreview-cluster-profile
+        - --target=e2e-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,12 +73,8 @@ presubmits:
         secret:
           secretName: ci-pull-credentials
       - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
+        secret:
+          secretName: cluster-secrets-aws
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -88,7 +84,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12-presubmits.yaml
index eca29a235a6b6..451d0c7319195 100644
--- a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.12-presubmits.yaml
@@ -5,21 +5,21 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e
+    cluster: build05
+    context: ci/prow/e2e-techpreview
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-platform-operators-release-4.12-e2e
+    name: pull-ci-openshift-priv-platform-operators-release-4.12-e2e-techpreview
     optional: true
     path_alias: github.com/openshift/platform-operators
-    rerun_command: /test e2e
+    rerun_command: /test e2e-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-techpreview-cluster-profile
+        - --target=e2e-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,12 +73,8 @@ presubmits:
         secret:
           secretName: ci-pull-credentials
       - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
+        secret:
+          secretName: cluster-secrets-aws
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -88,7 +84,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13-presubmits.yaml
index 859b5f0cb6be1..507c4209ba5ea 100644
--- a/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.13-presubmits.yaml
@@ -5,21 +5,21 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build02
-    context: ci/prow/e2e
+    cluster: build05
+    context: ci/prow/e2e-techpreview
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-platform-operators-release-4.13-e2e
+    name: pull-ci-openshift-priv-platform-operators-release-4.13-e2e-techpreview
     optional: true
     path_alias: github.com/openshift/platform-operators
-    rerun_command: /test e2e
+    rerun_command: /test e2e-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -30,8 +30,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-techpreview-cluster-profile
+        - --target=e2e-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,12 +73,8 @@ presubmits:
         secret:
           secretName: ci-pull-credentials
       - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
+        secret:
+          secretName: cluster-secrets-aws
       - name: github-credentials-openshift-ci-robot-private-git-cloner
         secret:
           secretName: github-credentials-openshift-ci-robot-private-git-cloner
@@ -88,7 +84,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master-presubmits.yaml
index 483cbb5a69ce8..79fd1d3e80b00 100644
--- a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-master-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -99,9 +99,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-prometheus-alertmanager-master-e2e-aws
+    name: pull-ci-openshift-priv-prometheus-alertmanager-master-e2e-aws-ovn
     path_alias: github.com/openshift/prometheus-alertmanager
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -111,8 +111,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -128,7 +128,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12-presubmits.yaml
index e54ca902cfe46..d8b56ef1e33fa 100644
--- a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.12-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -99,9 +99,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-prometheus-alertmanager-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-prometheus-alertmanager-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/prometheus-alertmanager
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -111,8 +111,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -128,7 +128,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13-presubmits.yaml
index 5a82091d6e8a3..67aafa0512c5a 100644
--- a/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.13-presubmits.yaml
@@ -89,7 +89,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -99,9 +99,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-prometheus-alertmanager-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-prometheus-alertmanager-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/prometheus-alertmanager
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -111,8 +111,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -128,7 +128,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -165,7 +165,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master-presubmits.yaml
index e5caed17f6e38..e886cfe530224 100644
--- a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-master-presubmits.yaml
@@ -63,7 +63,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -75,9 +75,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ptp-operator-master-e2e-aws
+    name: pull-ci-openshift-priv-ptp-operator-master-e2e-aws-ovn
     path_alias: github.com/openshift/ptp-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -87,8 +87,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -104,7 +104,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,7 +138,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12-presubmits.yaml
index 4f07bbd4a61ec..a9ed218fe873e 100644
--- a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.12-presubmits.yaml
@@ -63,7 +63,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -75,9 +75,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ptp-operator-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-ptp-operator-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/ptp-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -87,8 +87,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -104,7 +104,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,7 +138,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13-presubmits.yaml
index 89103473f2337..f3910601d6bc2 100644
--- a/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.13-presubmits.yaml
@@ -63,7 +63,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -75,9 +75,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ptp-operator-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-ptp-operator-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/ptp-operator
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -87,8 +87,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -104,7 +104,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,7 +138,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-postsubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-postsubmits.yaml
similarity index 83%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-postsubmits.yaml
index f1e777df4a594..8ac4a8d231428 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.10-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-postsubmits.yaml
@@ -1,20 +1,22 @@
 postsubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/route-controller-manager:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.10$
+    - ^main$
     cluster: build01
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-release-4.10-images
-    path_alias: github.com/openshift/cincinnati
+    name: branch-ci-openshift-priv-route-controller-manager-main-images
+    path_alias: github.com/openshift/route-controller-manager
     spec:
       containers:
       - args:
@@ -51,9 +53,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-presubmits.yaml
similarity index 67%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-presubmits.yaml
index 4caa4e6360417..1de2f47ebb3c0 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-main-presubmits.yaml
@@ -1,31 +1,38 @@
 presubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/route-controller-manager:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
+    - ^main$
+    - ^main-
     cluster: build01
-    context: ci/prow/cargo-test
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
+    name: pull-ci-openshift-priv-route-controller-manager-main-e2e-aws-ovn
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,9 +42,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -52,38 +64,47 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
+    - ^main$
+    - ^main-
     cluster: build01
-    context: ci/prow/e2e
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
+    name: pull-ci-openshift-priv-route-controller-manager-main-e2e-aws-upgrade
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -93,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -110,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,41 +159,46 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
-    cluster: build01
-    context: ci/prow/images
+    - ^main$
+    - ^main-
+    cluster: build02
+    context: ci/prow/e2e-gcp
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-route-controller-manager-main-e2e-gcp
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -182,6 +208,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -196,33 +230,48 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: ci-pull-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( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
+    - ^main$
+    - ^main-
     cluster: build01
-    context: ci/prow/rustfmt-1.54.0
+    context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
+    name: pull-ci-openshift-priv-route-controller-manager-main-images
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test images
     spec:
       containers:
       - args:
@@ -230,7 +279,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -254,33 +303,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
+    - ^main$
+    - ^main-
     cluster: build01
-    context: ci/prow/rustfmt-1.58.0
+    context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
+    name: pull-ci-openshift-priv-route-controller-manager-main-unit
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -288,7 +337,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
+        - --target=unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -312,33 +361,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.11$
-    - ^release-4\.11-
+    - ^main$
+    - ^main-
     cluster: build01
-    context: ci/prow/yaml-lint
+    context: ci/prow/verify
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.11-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
+    name: pull-ci-openshift-priv-route-controller-manager-main-verify
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -346,7 +395,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
+        - --target=verify
         command:
         - ci-operator
         image: ci-operator:latest
@@ -370,13 +419,10 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-postsubmits.yaml
new file mode 100644
index 0000000000000..f08ce716c9a78
--- /dev/null
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-postsubmits.yaml
@@ -0,0 +1,64 @@
+postsubmits:
+  openshift-priv/route-controller-manager:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    cluster: build01
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-priv-route-controller-manager-release-4.12-images
+    path_alias: github.com/openshift/route-controller-manager
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-presubmits.yaml
similarity index 68%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-presubmits.yaml
index 9fa935db3f635..83f9d32ad8f1c 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.12-presubmits.yaml
@@ -1,31 +1,38 @@
 presubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/route-controller-manager:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/cargo-test
+    cluster: build05
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-e2e-aws-ovn
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,9 +42,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -52,38 +64,47 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/e2e
+    cluster: build05
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-e2e-aws-upgrade
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -93,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -110,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,41 +159,46 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build01
-    context: ci/prow/images
+    cluster: build02
+    context: ci/prow/e2e-gcp
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-e2e-gcp
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -182,6 +208,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -196,33 +230,48 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: ci-pull-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( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/rustfmt-1.54.0
+    context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-images
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test images
     spec:
       containers:
       - args:
@@ -230,7 +279,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -254,33 +303,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/rustfmt-1.58.0
+    context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-unit
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -288,7 +337,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
+        - --target=unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -312,33 +361,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/yaml-lint
+    context: ci/prow/verify
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.12-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.12-verify
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -346,7 +395,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
+        - --target=verify
         command:
         - ci-operator
         image: ci-operator:latest
@@ -370,13 +419,10 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-postsubmits.yaml
new file mode 100644
index 0000000000000..6d07ca5294a85
--- /dev/null
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-postsubmits.yaml
@@ -0,0 +1,64 @@
+postsubmits:
+  openshift-priv/route-controller-manager:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    cluster: build01
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-priv-route-controller-manager-release-4.13-images
+    path_alias: github.com/openshift/route-controller-manager
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-presubmits.yaml
similarity index 68%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-presubmits.yaml
index 18fb49dc09e87..ef95313d106df 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.13-presubmits.yaml
@@ -1,31 +1,38 @@
 presubmits:
-  openshift-priv/cincinnati:
+  openshift-priv/route-controller-manager:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/cargo-test
+    cluster: build05
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-e2e-aws-ovn
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,9 +42,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -52,38 +64,47 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e
+    cluster: build05
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-e2e-aws-upgrade
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-aws-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -93,8 +114,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -110,7 +131,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -138,41 +159,46 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/images
+    cluster: build02
+    context: ci/prow/e2e-gcp
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-e2e-gcp
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -182,6 +208,14 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
@@ -196,33 +230,48 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: ci-pull-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( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/rustfmt-1.54.0
+    context: ci/prow/images
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-images
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test images
     spec:
       containers:
       - args:
@@ -230,7 +279,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -254,33 +303,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/rustfmt-1.58.0
+    context: ci/prow/unit
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-unit
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -288,7 +337,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
+        - --target=unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -312,33 +361,33 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/yaml-lint
+    context: ci/prow/verify
     decorate: true
     decoration_config:
-      skip_cloning: true
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
     hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.13-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
+    name: pull-ci-openshift-priv-route-controller-manager-release-4.13-verify
+    path_alias: github.com/openshift/route-controller-manager
+    rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -346,7 +395,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
+        - --target=verify
         command:
         - ci-operator
         image: ci-operator:latest
@@ -370,13 +419,10 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-master-presubmits.yaml
index 9d0f0b8b1a43a..ebc252073b590 100644
--- a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-master-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-telemeter-master-e2e-aws
+    name: pull-ci-openshift-priv-telemeter-master-e2e-aws-ovn
     path_alias: github.com/openshift/telemeter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12-presubmits.yaml
index 3908d2d2ef301..8d582434e9654 100644
--- a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-telemeter-release-4.12-e2e-aws
+    name: pull-ci-openshift-priv-telemeter-release-4.12-e2e-aws-ovn
     path_alias: github.com/openshift/telemeter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13-presubmits.yaml
index 355971d24abcd..82af1f93bed18 100644
--- a/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13-presubmits.yaml
@@ -88,7 +88,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -100,9 +100,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-telemeter-release-4.13-e2e-aws
+    name: pull-ci-openshift-priv-telemeter-release-4.13-e2e-aws-ovn
     path_alias: github.com/openshift/telemeter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -112,8 +112,8 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,7 +129,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -163,7 +163,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master-presubmits.yaml
index 76f9cac004a98..c02b91e26ef16 100644
--- a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master-presubmits.yaml
@@ -532,7 +532,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -550,9 +550,9 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-priv-windows-machine-config-operator-master-gcp-e2e-operator
-    optional: true
     path_alias: github.com/openshift/windows-machine-config-operator
     rerun_command: /test gcp-e2e-operator
+    skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -874,6 +874,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: vsphere
+    context: ci/prow/vsphere-e2e-ccm-install
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-windows-machine-config-operator-master-vsphere-e2e-ccm-install
+    optional: true
+    path_alias: github.com/openshift/windows-machine-config-operator
+    rerun_command: /test vsphere-e2e-ccm-install
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/vsphere-e2e-ccm-install-cluster-profile
+        - --target=vsphere-e2e-ccm-install
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/vsphere-e2e-ccm-install-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )vsphere-e2e-ccm-install,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12-presubmits.yaml
index 674a58716688e..091611f369fd2 100644
--- a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12-presubmits.yaml
@@ -532,7 +532,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
@@ -550,9 +550,9 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-priv-windows-machine-config-operator-release-4.12-gcp-e2e-operator
-    optional: true
     path_alias: github.com/openshift/windows-machine-config-operator
     rerun_command: /test gcp-e2e-operator
+    skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -874,6 +874,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: vsphere
+    context: ci/prow/vsphere-e2e-ccm-install
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-windows-machine-config-operator-release-4.12-vsphere-e2e-ccm-install
+    optional: true
+    path_alias: github.com/openshift/windows-machine-config-operator
+    rerun_command: /test vsphere-e2e-ccm-install
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/vsphere-e2e-ccm-install-cluster-profile
+        - --target=vsphere-e2e-ccm-install
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/vsphere-e2e-ccm-install-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )vsphere-e2e-ccm-install,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13-presubmits.yaml
index 573535e899be3..922fa134e05a9 100644
--- a/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13-presubmits.yaml
@@ -532,7 +532,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
@@ -550,9 +550,9 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-priv-windows-machine-config-operator-release-4.13-gcp-e2e-operator
-    optional: true
     path_alias: github.com/openshift/windows-machine-config-operator
     rerun_command: /test gcp-e2e-operator
+    skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -874,6 +874,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: vsphere
+    context: ci/prow/vsphere-e2e-ccm-install
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-windows-machine-config-operator-release-4.13-vsphere-e2e-ccm-install
+    optional: true
+    path_alias: github.com/openshift/windows-machine-config-operator
+    rerun_command: /test vsphere-e2e-ccm-install
+    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
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/vsphere-e2e-ccm-install-cluster-profile
+        - --target=vsphere-e2e-ccm-install
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/vsphere-e2e-ccm-install-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/github-credentials
+          name: github-credentials-openshift-ci-robot-private-git-cloner
+          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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )vsphere-e2e-ccm-install,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12-presubmits.yaml
index 40ca934db82af..510b31d795065 100644
--- a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.12-presubmits.yaml
@@ -1,22 +1,23 @@
 presubmits:
   openshift/baremetal-operator:
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build03
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-baremetal-operator-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-baremetal-operator-release-4.12-e2e-metal-ipi-bm
     optional: true
     path_alias: github.com/metal3-io/baremetal-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     spec:
       containers:
       - args:
@@ -25,8 +26,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +43,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +74,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13-presubmits.yaml
index dc282f56d9a86..27491d4ec51e5 100644
--- a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.13-presubmits.yaml
@@ -1,22 +1,23 @@
 presubmits:
   openshift/baremetal-operator:
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-baremetal-operator-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-baremetal-operator-release-4.13-e2e-metal-ipi-bm
     optional: true
     path_alias: github.com/metal3-io/baremetal-operator
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-bm
     spec:
       containers:
       - args:
@@ -25,8 +26,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +43,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +74,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/builder/openshift-builder-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/builder/openshift-builder-release-4.12-presubmits.yaml
index 0aef6ea079c14..96cc6df4c35ff 100644
--- a/ci-operator/jobs/openshift/builder/openshift-builder-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/builder/openshift-builder-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-builder-release-4.12-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,22 +72,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-builds-techpreview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.12-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
+    name: pull-ci-openshift-builder-release-4.12-e2e-aws-builds-techpreview
+    optional: true
+    rerun_command: /test e2e-aws-builds-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - --target=e2e-aws-builds-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,23 +146,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-builds-techpreview
+    context: ci/prow/e2e-aws-cgroupsv2
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.12-e2e-aws-builds-techpreview
+    name: pull-ci-openshift-builder-release-4.12-e2e-aws-cgroupsv2
     optional: true
-    rerun_command: /test e2e-aws-builds-techpreview
+    rerun_command: /test e2e-aws-cgroupsv2
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -171,8 +172,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
-        - --target=e2e-aws-builds-techpreview
+        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - --target=e2e-aws-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -188,7 +189,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -219,23 +220,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-image-ecosystem
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.12-e2e-aws-cgroupsv2
-    optional: true
-    rerun_command: /test e2e-aws-cgroupsv2
+    name: pull-ci-openshift-builder-release-4.12-e2e-aws-image-ecosystem
+    rerun_command: /test e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -245,8 +245,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -262,7 +262,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -293,22 +293,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-image-ecosystem
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.12-e2e-aws-image-ecosystem
-    rerun_command: /test e2e-aws-image-ecosystem
+    name: pull-ci-openshift-builder-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -318,8 +318,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -335,7 +335,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -366,7 +366,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/builder/openshift-builder-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/builder/openshift-builder-release-4.13-presubmits.yaml
index 752dc9f11f5df..6810d385682b9 100644
--- a/ci-operator/jobs/openshift/builder/openshift-builder-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/builder/openshift-builder-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-builder-release-4.13-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,22 +72,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-builds-techpreview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.13-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
+    name: pull-ci-openshift-builder-release-4.13-e2e-aws-builds-techpreview
+    optional: true
+    rerun_command: /test e2e-aws-builds-techpreview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - --target=e2e-aws-builds-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,23 +146,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-builds-techpreview
+    context: ci/prow/e2e-aws-cgroupsv2
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.13-e2e-aws-builds-techpreview
+    name: pull-ci-openshift-builder-release-4.13-e2e-aws-cgroupsv2
     optional: true
-    rerun_command: /test e2e-aws-builds-techpreview
+    rerun_command: /test e2e-aws-cgroupsv2
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -171,8 +172,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-techpreview-cluster-profile
-        - --target=e2e-aws-builds-techpreview
+        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - --target=e2e-aws-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -188,7 +189,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-techpreview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -219,23 +220,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-image-ecosystem
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.13-e2e-aws-cgroupsv2
-    optional: true
-    rerun_command: /test e2e-aws-cgroupsv2
+    name: pull-ci-openshift-builder-release-4.13-e2e-aws-image-ecosystem
+    rerun_command: /test e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -245,8 +245,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -262,7 +262,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -293,22 +293,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-image-ecosystem
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-builder-release-4.13-e2e-aws-image-ecosystem
-    rerun_command: /test e2e-aws-image-ecosystem
+    name: pull-ci-openshift-builder-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -318,8 +318,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -335,7 +335,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -366,7 +366,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12-presubmits.yaml
index 80ebab91fd022..41541dfa90639 100644
--- a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.12-presubmits.yaml
@@ -61,16 +61,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-manual-oidc
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-credential-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-cloud-credential-operator-release-4.12-e2e-aws-manual-oidc
+    optional: true
+    rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
       - args:
@@ -79,8 +79,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
+        - --target=e2e-aws-manual-oidc
         command:
         - ci-operator
         image: ci-operator:latest
@@ -96,7 +96,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -127,23 +127,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-manual-oidc
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-credential-operator-release-4.12-e2e-aws-manual-oidc
-    optional: true
-    rerun_command: /test e2e-aws-manual-oidc
+    name: pull-ci-openshift-cloud-credential-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -152,8 +152,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
-        - --target=e2e-aws-manual-oidc
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -169,7 +169,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -200,7 +200,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13-presubmits.yaml
index 3f6d2db103faf..76b525e56ebf5 100644
--- a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.13-presubmits.yaml
@@ -61,16 +61,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-manual-oidc
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-credential-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-cloud-credential-operator-release-4.13-e2e-aws-manual-oidc
+    optional: true
+    rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
       - args:
@@ -79,8 +79,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
+        - --target=e2e-aws-manual-oidc
         command:
         - ci-operator
         image: ci-operator:latest
@@ -96,7 +96,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -127,23 +127,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-manual-oidc
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-credential-operator-release-4.13-e2e-aws-manual-oidc
-    optional: true
-    rerun_command: /test e2e-aws-manual-oidc
+    name: pull-ci-openshift-cloud-credential-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -152,8 +152,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-manual-oidc-cluster-profile
-        - --target=e2e-aws-manual-oidc
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -169,7 +169,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-manual-oidc-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -200,7 +200,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-manual-oidc,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12-presubmits.yaml
index b2a4409dd2f2e..ea0e851903ce2 100644
--- a/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.12-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-aws
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-aws-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +72,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -226,16 +226,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-azure
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-azure-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -244,8 +244,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -261,7 +261,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -292,23 +292,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-gcp
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-gcp-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -317,8 +317,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -334,7 +334,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -369,7 +369,155 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-openstack-ovn-serial-e2e-only
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-openstack-ovn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-ovn-serial-e2e-only
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-ovn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-serial-e2e-only-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn-serial-e2e-only,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-openstack-sdn-serial-e2e-only
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.12-e2e-openstack-sdn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-sdn-serial-e2e-only
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-sdn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-sdn-serial-e2e-only-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-sdn-serial-e2e-only,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13-presubmits.yaml
index 6aa2fae2f542d..20b44e8598f54 100644
--- a/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.13-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-aws
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-aws-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +72,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -226,16 +226,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-azure
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-azure-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -244,8 +244,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -261,7 +261,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -292,23 +292,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build02
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-gcp
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-gcp-ovn
     path_alias: openshift/cloud-network-config-controller
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -317,8 +317,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -334,7 +334,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -369,7 +369,155 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-openstack-ovn-serial-e2e-only
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-openstack-ovn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-ovn-serial-e2e-only
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-ovn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-ovn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-serial-e2e-only-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn-serial-e2e-only,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-openstack-sdn-serial-e2e-only
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: openstack-vexxhost
+      ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-network-config-controller-release-4.13-e2e-openstack-sdn-serial-e2e-only
+    optional: true
+    path_alias: openshift/cloud-network-config-controller
+    rerun_command: /test e2e-openstack-sdn-serial-e2e-only
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-openstack-sdn-serial-e2e-only-cluster-profile
+        - --target=e2e-openstack-sdn-serial-e2e-only
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-sdn-serial-e2e-only-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-openstack-vexxhost
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-sdn-serial-e2e-only,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
index 80e4e1658a747..fcb3b2e1c5794 100644
--- a/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.12-presubmits.yaml
@@ -1,5 +1,79 @@
 presubmits:
   openshift/cloud-provider-alibaba-cloud:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-alibabacloud
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: alibabacloud
+      ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.12-e2e-alibabacloud
+    optional: true
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test e2e-alibabacloud
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-alibabacloud-cluster-profile
+        - --target=e2e-alibabacloud
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-alibabacloud-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-alibabacloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-alibabacloud,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -96,3 +170,99 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/lint
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.12-lint
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/unit
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.12-unit
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test unit
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
index b99f1891aa354..37b41d5908441 100644
--- a/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-release-4.13-presubmits.yaml
@@ -1,5 +1,79 @@
 presubmits:
   openshift/cloud-provider-alibaba-cloud:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-alibabacloud
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: alibabacloud
+      ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.13-e2e-alibabacloud
+    optional: true
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test e2e-alibabacloud
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-alibabacloud-cluster-profile
+        - --target=e2e-alibabacloud
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-alibabacloud-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-alibabacloud
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-alibabacloud,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -97,3 +171,99 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/lint
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.13-lint
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test lint
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=lint
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )lint,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/unit
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-alibaba-cloud-release-4.13-unit
+    path_alias: k8s.io/cloud-provider-alibaba-cloud
+    rerun_command: /test unit
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=unit
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-postsubmits.yaml
similarity index 73%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-postsubmits.yaml
rename to ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-postsubmits.yaml
index c28211f7ccdad..82a7e28611247 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-postsubmits.yaml
@@ -1,5 +1,5 @@
 postsubmits:
-  openshift-priv/cincinnati-operator:
+  openshift/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
@@ -8,20 +8,18 @@ postsubmits:
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cincinnati-operator-release-4.12-images
-    path_alias: github.com/openshift/cincinnati-operator
+    name: branch-ci-openshift-cloud-provider-nutanix-release-4.12-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
@@ -37,9 +35,6 @@ postsubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -51,9 +46,6 @@ postsubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-presubmits.yaml
similarity index 64%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-presubmits.yaml
rename to ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-presubmits.yaml
index f2235e81e8a8e..725cea04465ec 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.7-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.12-presubmits.yaml
@@ -1,30 +1,33 @@
 presubmits:
-  openshift-priv/cincinnati-operator:
+  openshift/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.7$
-    - ^release-4\.7-
-    cluster: build02
-    context: ci/prow/images
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/e2e-nutanix
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: nutanix
+      ci-operator.openshift.io/cloud-cluster-profile: nutanix
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.7-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.12-e2e-nutanix
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test e2e-nutanix
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-nutanix-cluster-profile
+        - --target=e2e-nutanix
         command:
         - ci-operator
         image: ci-operator:latest
@@ -34,12 +37,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-nutanix-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -48,46 +56,48 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-nutanix
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.7$
-    - ^release-4\.7-
-    cluster: build02
-    context: ci/prow/operator-e2e
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/fmt
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.7-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.12-fmt
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test fmt
     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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
+        - --target=fmt
         command:
         - ci-operator
         image: ci-operator:latest
@@ -97,20 +107,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -119,55 +118,84 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
+      - name: pull-secret
         secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: registry-pull-credentials
+      - name: result-aggregator
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )fmt,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.12-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.7$
-    - ^release-4\.7-
-    cluster: build02
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
     context: ci/prow/unit
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.7-unit
-    path_alias: github.com/openshift/cincinnati-operator
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.12-unit
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     rerun_command: /test unit
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=unit
         command:
@@ -182,9 +210,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -193,9 +218,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-postsubmits.yaml
new file mode 100644
index 0000000000000..fb827e2f15835
--- /dev/null
+++ b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-postsubmits.yaml
@@ -0,0 +1,57 @@
+postsubmits:
+  openshift/cloud-provider-nutanix:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    cluster: build01
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-cloud-provider-nutanix-release-4.13-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-presubmits.yaml
similarity index 64%
rename from ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-presubmits.yaml
rename to ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-presubmits.yaml
index 59fbdea8be19f..c49e0ab4690a7 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati-operator/openshift-priv-cincinnati-operator-release-4.8-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-release-4.13-presubmits.yaml
@@ -1,30 +1,33 @@
 presubmits:
-  openshift-priv/cincinnati-operator:
+  openshift/cloud-provider-nutanix:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.8$
-    - ^release-4\.8-
-    cluster: build02
-    context: ci/prow/images
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-nutanix
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: nutanix
+      ci-operator.openshift.io/cloud-cluster-profile: nutanix
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.8-images
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test images
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.13-e2e-nutanix
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test e2e-nutanix
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-nutanix-cluster-profile
+        - --target=e2e-nutanix
         command:
         - ci-operator
         image: ci-operator:latest
@@ -34,12 +37,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-nutanix-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -48,46 +56,48 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-nutanix
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )images,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-nutanix,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.8$
-    - ^release-4\.8-
-    cluster: build02
-    context: ci/prow/operator-e2e
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/fmt
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
-      ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.8-operator-e2e
-    path_alias: github.com/openshift/cincinnati-operator
-    rerun_command: /test operator-e2e
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.13-fmt
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test fmt
     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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/operator-e2e-cluster-profile
-        - --target=operator-e2e
+        - --target=fmt
         command:
         - ci-operator
         image: ci-operator:latest
@@ -97,20 +107,9 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/operator-e2e-cluster-profile
-          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -119,55 +118,85 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
+      - name: pull-secret
         secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: registry-pull-credentials
+      - name: result-aggregator
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )fmt,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.13-images
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        - --target=[release:latest]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.8$
-    - ^release-4\.8-
-    cluster: build02
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
     context: ci/prow/unit
     decorate: true
     decoration_config:
       skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-operator-release-4.8-unit
-    path_alias: github.com/openshift/cincinnati-operator
+    name: pull-ci-openshift-cloud-provider-nutanix-release-4.13-unit
+    path_alias: github.com/nutanix-cloud-native/cloud-provider-nutanix
     rerun_command: /test unit
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=unit
         command:
@@ -182,9 +211,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -193,9 +219,6 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12-presubmits.yaml
index 0834e1da6bd5b..a7d9f0a546887 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.12-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-provider-aws-release-4.12-e2e-aws
+    name: pull-ci-openshift-cluster-api-provider-aws-release-4.12-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api-provider-aws
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -25,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13-presubmits.yaml
index 23773363607a9..035894a856089 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.13-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-provider-aws-release-4.13-e2e-aws
+    name: pull-ci-openshift-cluster-api-provider-aws-release-4.13-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api-provider-aws
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -25,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.12-presubmits.yaml
index 26dded55d4344..f604145113442 100644
--- a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.12-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-release-4.12-e2e-aws
+    name: pull-ci-openshift-cluster-api-release-4.12-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -25,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.13-presubmits.yaml
index f5ed6de3156aa..4c8ec0b04a4e9 100644
--- a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-release-4.13-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-release-4.13-e2e-aws
+    name: pull-ci-openshift-cluster-api-release-4.13-e2e-aws-ovn
     path_alias: sigs.k8s.io/cluster-api
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -25,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12-presubmits.yaml
index 77c0b6ecb78a4..f06250dd8c542 100644
--- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.12-presubmits.yaml
@@ -225,16 +225,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
-    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
+    optional: true
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -243,8 +243,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -260,7 +260,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -291,23 +291,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
-    optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
@@ -316,8 +316,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -333,7 +333,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,22 +364,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.12-e2e-metal-ipi-sdn-bm
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -389,8 +390,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -406,7 +407,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -437,7 +438,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13-presubmits.yaml
index e59321cbee4e2..786b938c964bb 100644
--- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.13-presubmits.yaml
@@ -225,16 +225,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
-    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
+    optional: true
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
       - args:
@@ -243,8 +243,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -260,7 +260,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -291,23 +291,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
-    optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
       - args:
@@ -316,8 +316,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -333,7 +333,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,22 +364,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-cluster-baremetal-operator-release-4.13-e2e-metal-ipi-sdn-bm
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -389,8 +390,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -406,7 +407,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -437,7 +438,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12-presubmits.yaml
index b495f0bfdd6c7..5ff3a24fa8ff9 100644
--- a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-config-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-config-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13-presubmits.yaml
index dc29e95287e64..a7d606488640f 100644
--- a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-config-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-config-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
index d8cd3877badfd..07eaa8fcf6fde 100644
--- a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-postsubmits.yaml
@@ -6,8 +6,6 @@ postsubmits:
     - ^release-4\.12$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
diff --git a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
index da51ebccbb586..d8b28b47bf746 100644
--- a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.12-presubmits.yaml
@@ -6,17 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-disruptive
+    optional: true
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -26,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -43,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -74,25 +73,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-disruptive
-    optional: true
-    rerun_command: /test e2e-aws-disruptive
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -102,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -119,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -150,7 +146,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -159,8 +155,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-aws-serial
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
@@ -234,8 +228,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-aws-upgrade
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
@@ -309,8 +301,6 @@ presubmits:
     cluster: build03
     context: ci/prow/fmt
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -358,8 +348,6 @@ presubmits:
     cluster: build03
     context: ci/prow/generate
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -407,8 +395,6 @@ presubmits:
     cluster: build03
     context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -456,8 +442,6 @@ presubmits:
     cluster: build03
     context: ci/prow/lint
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -505,8 +489,6 @@ presubmits:
     cluster: build03
     context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -554,8 +536,6 @@ presubmits:
     cluster: build03
     context: ci/prow/vendor
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -603,8 +583,6 @@ presubmits:
     cluster: build03
     context: ci/prow/vet
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
index 44cc5120b1a0d..c7f6d7c595ee8 100644
--- a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-postsubmits.yaml
@@ -6,8 +6,6 @@ postsubmits:
     - ^release-4\.13$
     cluster: build01
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
diff --git a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
index 11b14640e79c4..fa523117cedfc 100644
--- a/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.13-presubmits.yaml
@@ -6,17 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-disruptive
+    optional: true
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -26,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -43,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -74,25 +73,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-disruptive
-    optional: true
-    rerun_command: /test e2e-aws-disruptive
+    name: pull-ci-openshift-cluster-control-plane-machine-set-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -102,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -119,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -150,7 +146,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -159,8 +155,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-aws-serial
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
@@ -234,8 +228,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-aws-upgrade
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
@@ -309,8 +301,6 @@ presubmits:
     cluster: build01
     context: ci/prow/fmt
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -358,8 +348,6 @@ presubmits:
     cluster: build01
     context: ci/prow/generate
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -407,8 +395,6 @@ presubmits:
     cluster: build01
     context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -457,8 +443,6 @@ presubmits:
     cluster: build01
     context: ci/prow/lint
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -506,8 +490,6 @@ presubmits:
     cluster: build01
     context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -555,8 +537,6 @@ presubmits:
     cluster: build01
     context: ci/prow/vendor
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -604,8 +584,6 @@ presubmits:
     cluster: build01
     context: ci/prow/vet
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12-presubmits.yaml
index 074329c4ba1f6..2bd6042c642ef 100644
--- a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-dns-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-dns-operator-release-4.12-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-dns-operator-release-4.12-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-dns-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13-presubmits.yaml
index a708f8c96eb59..114f963221ace 100644
--- a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-dns-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-dns-operator-release-4.13-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-dns-operator-release-4.13-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-dns-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12-presubmits.yaml
index 57e11d117a7c6..ab56b48d6d967 100644
--- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.12-presubmits.yaml
@@ -225,16 +225,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-image-registry-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-cluster-image-registry-operator-release-4.12-e2e-azure-operator
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -244,8 +244,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -261,7 +261,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -292,23 +292,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-image-registry-operator-release-4.12-e2e-azure-operator
+    name: pull-ci-openshift-cluster-image-registry-operator-release-4.12-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -318,8 +318,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -335,7 +335,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -366,7 +366,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13-presubmits.yaml
index e8f11250c826c..4dae5adf13c3b 100644
--- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.13-presubmits.yaml
@@ -225,16 +225,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-image-registry-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-cluster-image-registry-operator-release-4.13-e2e-azure-operator
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -244,8 +244,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -261,7 +261,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -292,23 +292,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-image-registry-operator-release-4.13-e2e-azure-operator
+    name: pull-ci-openshift-cluster-image-registry-operator-release-4.13-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     run_if_changed: ^(.*azure.*|vendor/github\.com/Azure/.*)\.go$
     spec:
       containers:
@@ -318,8 +318,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -335,7 +335,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -366,7 +366,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
index 78392362a167c..537678c3ebc73 100644
--- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator-disruptive-single-node
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.12-e2e-aws-operator-disruptive-single-node
+    optional: true
+    rerun_command: /test e2e-aws-operator-disruptive-single-node
     spec:
       containers:
       - args:
@@ -23,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - --target=e2e-aws-operator-disruptive-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,23 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-operator-disruptive-single-node
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.12-e2e-aws-operator-disruptive-single-node
-    optional: true
-    rerun_command: /test e2e-aws-operator-disruptive-single-node
+    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
-        - --target=e2e-aws-operator-disruptive-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -144,7 +144,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
index f5420dec05f2f..f0c70c440f2c1 100644
--- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator-disruptive-single-node
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.13-e2e-aws-operator-disruptive-single-node
+    optional: true
+    rerun_command: /test e2e-aws-operator-disruptive-single-node
     spec:
       containers:
       - args:
@@ -23,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - --target=e2e-aws-operator-disruptive-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,23 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-operator-disruptive-single-node
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.13-e2e-aws-operator-disruptive-single-node
-    optional: true
-    rerun_command: /test e2e-aws-operator-disruptive-single-node
+    name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
-        - --target=e2e-aws-operator-disruptive-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-disruptive-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -144,7 +144,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-disruptive-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12-presubmits.yaml
index 7c60033df1917..f28c7961f19a1 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12-presubmits.yaml
@@ -1010,6 +1010,239 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-network-migration-rollback,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build04
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv4
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.12-e2e-network-mtu-migration-ovn-ipv4
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv4
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv4-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-ovn-ipv4,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv6
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.12-e2e-network-mtu-migration-ovn-ipv6
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv6
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv6
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv6-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-network-mtu-migration-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build04
+    context: ci/prow/e2e-network-mtu-migration-sdn-ipv4
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.12-e2e-network-mtu-migration-sdn-ipv4
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-sdn-ipv4
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-sdn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-sdn-ipv4-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-sdn-ipv4,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13-presubmits.yaml
index 761a69b0ec561..4bf0c6fae0236 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.13-presubmits.yaml
@@ -1010,6 +1010,239 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-network-migration-rollback,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build04
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv4
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.13-e2e-network-mtu-migration-ovn-ipv4
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv4
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv4-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-ovn-ipv4,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-network-mtu-migration-ovn-ipv6
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: equinix-ocp-metal
+      ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.13-e2e-network-mtu-migration-ovn-ipv6
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-ovn-ipv6
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-ovn-ipv6-cluster-profile
+        - --target=e2e-network-mtu-migration-ovn-ipv6
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-ovn-ipv6-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-equinix-ocp-metal
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-network-mtu-migration-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build04
+    context: ci/prow/e2e-network-mtu-migration-sdn-ipv4
+    decorate: true
+    decoration_config:
+      timeout: 5h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.13-e2e-network-mtu-migration-sdn-ipv4
+    optional: true
+    rerun_command: /test e2e-network-mtu-migration-sdn-ipv4
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-network-mtu-migration-sdn-ipv4-cluster-profile
+        - --target=e2e-network-mtu-migration-sdn-ipv4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-network-mtu-migration-sdn-ipv4-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-network-mtu-migration-sdn-ipv4,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12-presubmits.yaml
index 29812c3140333..e60be14a6e48c 100644
--- a/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.12-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.12-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13-presubmits.yaml
index 32d88ef39c4ae..1499e33217b64 100644
--- a/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.13-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.13-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-node-tuning-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
index 71f14b86e3766..4c3518905081e 100644
--- a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
index a94bd0f7a792e..fe639ccc3c036 100644
--- a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,22 +71,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
index b041d0a55b64e..7cfed7e4adb7c 100644
--- a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,22 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
index dd853942cc2b3..a18eb0cb2bf3c 100644
--- a/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,22 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-cluster-openshift-controller-manager-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12-presubmits.yaml
index 196ad665edcc7..be7f2da185777 100644
--- a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.12-presubmits.yaml
@@ -566,7 +566,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws
+    context: ci/prow/okd-e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -574,9 +574,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws
+    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-builds
     optional: true
-    rerun_command: /test okd-e2e-aws
+    rerun_command: /test okd-e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -586,8 +586,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         - --variant=okd
         command:
         - ci-operator
@@ -604,7 +604,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -635,14 +635,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-builds
+    context: ci/prow/okd-e2e-aws-image-ecosystem
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -650,9 +650,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-builds
+    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-image-ecosystem
     optional: true
-    rerun_command: /test okd-e2e-aws-builds
+    rerun_command: /test okd-e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -662,8 +662,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         - --variant=okd
         command:
         - ci-operator
@@ -680,7 +680,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -711,14 +711,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-image-ecosystem
+    context: ci/prow/okd-e2e-aws-jenkins
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -726,9 +726,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-image-ecosystem
+    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-jenkins
     optional: true
-    rerun_command: /test okd-e2e-aws-image-ecosystem
+    rerun_command: /test okd-e2e-aws-jenkins
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -738,8 +738,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         - --variant=okd
         command:
         - ci-operator
@@ -756,7 +756,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -787,14 +787,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-jenkins
+    context: ci/prow/okd-e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -802,9 +802,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-jenkins
+    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-operator
     optional: true
-    rerun_command: /test okd-e2e-aws-jenkins
+    rerun_command: /test okd-e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -814,8 +814,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         - --variant=okd
         command:
         - ci-operator
@@ -832,7 +832,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -863,14 +863,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-operator
+    context: ci/prow/okd-e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -878,10 +878,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-operator
+    name: pull-ci-openshift-cluster-samples-operator-release-4.12-okd-e2e-aws-ovn
     optional: true
-    rerun_command: /test okd-e2e-aws-operator
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test okd-e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -890,8 +889,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         - --variant=okd
         command:
         - ci-operator
@@ -908,7 +907,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -939,7 +938,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13-presubmits.yaml
index 44db5c42a1ea8..775e5fe84e8a7 100644
--- a/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.13-presubmits.yaml
@@ -567,7 +567,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws
+    context: ci/prow/okd-e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -575,9 +575,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws
+    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-builds
     optional: true
-    rerun_command: /test okd-e2e-aws
+    rerun_command: /test okd-e2e-aws-builds
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -587,8 +587,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         - --variant=okd
         command:
         - ci-operator
@@ -605,7 +605,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -636,14 +636,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-builds
+    context: ci/prow/okd-e2e-aws-image-ecosystem
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -651,9 +651,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-builds
+    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-image-ecosystem
     optional: true
-    rerun_command: /test okd-e2e-aws-builds
+    rerun_command: /test okd-e2e-aws-image-ecosystem
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -663,8 +663,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - --target=e2e-aws-image-ecosystem
         - --variant=okd
         command:
         - ci-operator
@@ -681,7 +681,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -712,14 +712,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-image-ecosystem,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-image-ecosystem
+    context: ci/prow/okd-e2e-aws-jenkins
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -727,9 +727,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-image-ecosystem
+    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-jenkins
     optional: true
-    rerun_command: /test okd-e2e-aws-image-ecosystem
+    rerun_command: /test okd-e2e-aws-jenkins
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -739,8 +739,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-ecosystem-cluster-profile
-        - --target=e2e-aws-image-ecosystem
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         - --variant=okd
         command:
         - ci-operator
@@ -757,7 +757,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -788,14 +788,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-jenkins
+    context: ci/prow/okd-e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -803,9 +803,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-jenkins
+    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-operator
     optional: true
-    rerun_command: /test okd-e2e-aws-jenkins
+    rerun_command: /test okd-e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -815,8 +815,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         - --variant=okd
         command:
         - ci-operator
@@ -833,7 +833,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -864,14 +864,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws-operator
+    context: ci/prow/okd-e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -879,10 +879,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-operator
+    name: pull-ci-openshift-cluster-samples-operator-release-4.13-okd-e2e-aws-ovn
     optional: true
-    rerun_command: /test okd-e2e-aws-operator
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    rerun_command: /test okd-e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -891,8 +890,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         - --variant=okd
         command:
         - ci-operator
@@ -909,7 +908,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -940,7 +939,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml
index 3fa8b8959fa9a..0be04c3bd7634 100644
--- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.12-presubmits.yaml
@@ -1,20 +1,21 @@
 presubmits:
   openshift/cluster-storage-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-aws-csi
+    optional: true
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -23,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,23 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-aws-csi
-    optional: true
-    rerun_command: /test e2e-aws-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -144,7 +144,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -296,16 +296,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure-csi
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-csi
     spec:
       containers:
       - args:
@@ -314,8 +314,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
+        - --target=e2e-azure-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -331,7 +331,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -362,23 +362,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure-csi
+    context: ci/prow/e2e-azure-file-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure-file-csi
     optional: true
-    rerun_command: /test e2e-azure-csi
+    rerun_command: /test e2e-azure-file-csi
     spec:
       containers:
       - args:
@@ -387,8 +387,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
-        - --target=e2e-azure-csi
+        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
+        - --target=e2e-azure-file-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -404,7 +404,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -435,23 +435,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure-file-csi
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure-file-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-file-csi
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -460,8 +460,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
-        - --target=e2e-azure-file-csi
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -477,7 +477,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -508,22 +508,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-gcp-csi
+    optional: true
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -532,8 +533,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -549,7 +550,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -584,23 +585,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-gcp-csi
-    optional: true
-    rerun_command: /test e2e-gcp-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.12-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -609,8 +609,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -626,7 +626,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -661,7 +661,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13-presubmits.yaml
index 8b1dc283af836..62919016ca9ac 100644
--- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.13-presubmits.yaml
@@ -1,20 +1,21 @@
 presubmits:
   openshift/cluster-storage-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-aws-csi
+    optional: true
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -23,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,23 +72,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-aws-csi
-    optional: true
-    rerun_command: /test e2e-aws-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -96,8 +96,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -113,7 +113,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -144,7 +144,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -296,16 +296,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure-csi
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-csi
     spec:
       containers:
       - args:
@@ -314,8 +314,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
+        - --target=e2e-azure-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -331,7 +331,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -362,23 +362,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-csi
+    context: ci/prow/e2e-azure-file-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure-file-csi
     optional: true
-    rerun_command: /test e2e-azure-csi
+    rerun_command: /test e2e-azure-file-csi
     spec:
       containers:
       - args:
@@ -387,8 +387,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-csi-cluster-profile
-        - --target=e2e-azure-csi
+        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
+        - --target=e2e-azure-file-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -404,7 +404,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -435,23 +435,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-file-csi
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure-file-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-file-csi
+    rerun_command: /test e2e-azure-ovn
     spec:
       containers:
       - args:
@@ -460,8 +460,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-file-csi-cluster-profile
-        - --target=e2e-azure-file-csi
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -477,7 +477,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-file-csi-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -508,22 +508,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-file-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-gcp-csi
+    optional: true
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -532,8 +533,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -549,7 +550,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -584,23 +585,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-gcp-csi
-    optional: true
-    rerun_command: /test e2e-gcp-csi
+    name: pull-ci-openshift-cluster-storage-operator-release-4.13-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -609,8 +609,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -626,7 +626,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -661,7 +661,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12-presubmits.yaml
index c6dd2813cb717..44c40f2b31320 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.12-presubmits.yaml
@@ -152,15 +152,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-version-operator-release-4.12-e2e-agnostic-upgrade
-    rerun_command: /test e2e-agnostic-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.12-e2e-agnostic-upgrade-into-change
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -218,7 +218,80 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-version-operator-release-4.12-e2e-agnostic-upgrade-out-of-change
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-agnostic-upgrade-out-of-change-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-azure4
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13-presubmits.yaml
index 2a32cb3d7507b..bea87d1404570 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.13-presubmits.yaml
@@ -152,15 +152,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-version-operator-release-4.13-e2e-agnostic-upgrade
-    rerun_command: /test e2e-agnostic-upgrade
+    name: pull-ci-openshift-cluster-version-operator-release-4.13-e2e-agnostic-upgrade-into-change
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -218,7 +218,80 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: azure4
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-version-operator-release-4.13-e2e-agnostic-upgrade-out-of-change
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-agnostic-upgrade-out-of-change-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-azure4
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.12-presubmits.yaml
index d39db4f001912..3ef17a11c6f03 100644
--- a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.12-presubmits.yaml
@@ -295,15 +295,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-console-operator-release-4.12-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-console-operator-release-4.12-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -312,8 +312,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -329,7 +329,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,7 +364,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.13-presubmits.yaml
index 407730464142f..657253bca164d 100644
--- a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.13-presubmits.yaml
@@ -295,15 +295,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-console-operator-release-4.13-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-console-operator-release-4.13-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -312,8 +312,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -329,7 +329,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -364,7 +364,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-periodics.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-periodics.yaml
new file mode 100644
index 0000000000000..a8f978a1a9544
--- /dev/null
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-periodics.yaml
@@ -0,0 +1,75 @@
+periodics:
+- agent: kubernetes
+  cluster: build04
+  cron: 0 */12 * * *
+  decorate: true
+  extra_refs:
+  - base_ref: release-4.12
+    org: openshift
+    repo: gcp-filestore-csi-driver-operator
+  labels:
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: gcp
+    ci.openshift.io/generator: prowgen
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-nightly-operator-e2e
+  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=/secrets/ci-pull-credentials
+      - --secret-dir=/usr/local/nightly-operator-e2e-cluster-profile
+      - --target=nightly-operator-e2e
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /etc/boskos
+        name: boskos
+        readOnly: true
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /usr/local/nightly-operator-e2e-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: ci-pull-credentials
+      secret:
+        secretName: ci-pull-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
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml
new file mode 100644
index 0000000000000..3ade51551bfe9
--- /dev/null
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-postsubmits.yaml
@@ -0,0 +1,54 @@
+postsubmits:
+  openshift/gcp-filestore-csi-driver-operator:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    cluster: build01
+    decorate: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
index a7fd4637fc992..27e4d532e7118 100644
--- a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml
@@ -6,22 +6,20 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/unit
+    context: ci/prow/ci-index-gcp-filestore-csi-driver-operator-bundle
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-unit
-    rerun_command: /test unit
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-ci-index-gcp-filestore-csi-driver-operator-bundle
+    rerun_command: /test ci-index-gcp-filestore-csi-driver-operator-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=ci-index-gcp-filestore-csi-driver-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,4 +46,175 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-gcp-filestore-csi-driver-operator-bundle,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-images
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/operator-e2e
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-operator-e2e
+    optional: true
+    rerun_command: /test operator-e2e
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )operator-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build01
+    context: ci/prow/verify
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.12-verify
+    rerun_command: /test verify
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=verify
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-periodics.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-periodics.yaml
new file mode 100644
index 0000000000000..57fcc4e4e00a8
--- /dev/null
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-periodics.yaml
@@ -0,0 +1,75 @@
+periodics:
+- agent: kubernetes
+  cluster: build04
+  cron: 0 */12 * * *
+  decorate: true
+  extra_refs:
+  - base_ref: release-4.13
+    org: openshift
+    repo: gcp-filestore-csi-driver-operator
+  labels:
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: gcp
+    ci.openshift.io/generator: prowgen
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-nightly-operator-e2e
+  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=/secrets/ci-pull-credentials
+      - --secret-dir=/usr/local/nightly-operator-e2e-cluster-profile
+      - --target=nightly-operator-e2e
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /etc/boskos
+        name: boskos
+        readOnly: true
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /usr/local/nightly-operator-e2e-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: ci-pull-credentials
+      secret:
+        secretName: ci-pull-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
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml
new file mode 100644
index 0000000000000..0f81fd04c6655
--- /dev/null
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-postsubmits.yaml
@@ -0,0 +1,54 @@
+postsubmits:
+  openshift/gcp-filestore-csi-driver-operator:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    cluster: build01
+    decorate: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
index 10348934425ee..e061cbb2f57e6 100644
--- a/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml
@@ -6,22 +6,20 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/unit
+    context: ci/prow/ci-index-gcp-filestore-csi-driver-operator-bundle
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-unit
-    rerun_command: /test unit
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-ci-index-gcp-filestore-csi-driver-operator-bundle
+    rerun_command: /test ci-index-gcp-filestore-csi-driver-operator-bundle
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=ci-index-gcp-filestore-csi-driver-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,4 +46,176 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-index-gcp-filestore-csi-driver-operator-bundle,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/images
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-images
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        - --target=[release:latest]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build02
+    context: ci/prow/operator-e2e
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-operator-e2e
+    optional: true
+    rerun_command: /test operator-e2e
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/operator-e2e-cluster-profile
+        - --target=operator-e2e
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/operator-e2e-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )operator-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/verify
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.13-verify
+    rerun_command: /test verify
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=verify
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12-presubmits.yaml
index 5acab51751b8f..ee1ee0479dd99 100644
--- a/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.12-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build04
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-customization-controller-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-image-customization-controller-release-4.12-e2e-metal-ipi-sdn-bm
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13-presubmits.yaml
index 21305974e18a0..b60db80bb7127 100644
--- a/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/image-customization-controller/openshift-image-customization-controller-release-4.13-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-sdn-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-customization-controller-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-image-customization-controller-release-4.13-e2e-metal-ipi-sdn-bm
+    rerun_command: /test e2e-metal-ipi-sdn-bm
     skip_if_only_changed: (^[A-Z]+\.md$)|((^|/)OWNERS$)
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
+        - --target=e2e-metal-ipi-sdn-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.12-presubmits.yaml
index ab26a9f1d390f..a5c7d107e8e6e 100644
--- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.12-presubmits.yaml
@@ -79,15 +79,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-registry-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-image-registry-release-4.12-e2e-aws-image-registry
+    rerun_command: /test e2e-aws-image-registry
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,22 +145,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-registry-release-4.12-e2e-aws-image-registry
-    rerun_command: /test e2e-aws-image-registry
+    name: pull-ci-openshift-image-registry-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -218,7 +218,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.13-presubmits.yaml
index f1a2156e3531d..1dfcba96f0103 100644
--- a/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-4.13-presubmits.yaml
@@ -79,15 +79,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-registry-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-image-registry-release-4.13-e2e-aws-image-registry
+    rerun_command: /test e2e-aws-image-registry
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,22 +145,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-image-registry-release-4.13-e2e-aws-image-registry
-    rerun_command: /test e2e-aws-image-registry
+    name: pull-ci-openshift-image-registry-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -218,7 +218,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-presubmits.yaml
index 72f2c173ccb6c..89e129e609247 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-presubmits.yaml
@@ -3448,7 +3448,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/okd-e2e-aws
+    context: ci/prow/okd-e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -3456,9 +3456,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.12-okd-e2e-aws
+    name: pull-ci-openshift-installer-release-4.12-okd-e2e-aws-ovn
     optional: true
-    rerun_command: /test okd-e2e-aws
+    rerun_command: /test okd-e2e-aws-ovn
     skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(azure|baremetal|gcp|libvirt|openstack|ovirt|vsphere)/)
     spec:
       containers:
@@ -3468,8 +3468,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         - --variant=okd
         command:
         - ci-operator
@@ -3486,7 +3486,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -3517,7 +3517,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-presubmits.yaml
index 2f8981e21063a..de4cc913d2514 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-presubmits.yaml
@@ -3510,7 +3510,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/okd-e2e-aws
+    context: ci/prow/okd-e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
@@ -3518,9 +3518,9 @@ presubmits:
       ci-operator.openshift.io/variant: okd
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.13-okd-e2e-aws
+    name: pull-ci-openshift-installer-release-4.13-okd-e2e-aws-ovn
     optional: true
-    rerun_command: /test okd-e2e-aws
+    rerun_command: /test okd-e2e-aws-ovn
     skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(azure|baremetal|gcp|libvirt|openstack|ovirt|vsphere)/)
     spec:
       containers:
@@ -3530,8 +3530,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         - --variant=okd
         command:
         - ci-operator
@@ -3548,7 +3548,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -3579,7 +3579,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )okd-e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12-presubmits.yaml
index c4c514b87e64f..cbc0a8b526765 100644
--- a/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.12-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-agent-image-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-agent-image-release-4.12-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13-presubmits.yaml
index d463a3b40a7e3..a83d32ff1efa2 100644
--- a/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-agent-image/openshift-ironic-agent-image-release-4.13-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-agent-image-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-agent-image-release-4.13-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.12-presubmits.yaml
index 5e811638fec4b..b646bfce47b35 100644
--- a/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.12-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-image-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-image-release-4.12-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.13-presubmits.yaml
index 6d5218e0ac420..845643eac3cab 100644
--- a/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-image/openshift-ironic-image-release-4.13-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-image-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-image-release-4.13-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12-presubmits.yaml
index b851ed99013f0..fc26c3974aeed 100644
--- a/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.12-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-ipa-downloader-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-ipa-downloader-release-4.12-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13-presubmits.yaml
index ef879c13f1f33..277994af11cff 100644
--- a/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-ipa-downloader/openshift-ironic-ipa-downloader-release-4.13-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-ipa-downloader-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-ipa-downloader-release-4.13-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12-presubmits.yaml
index 59dfc4cd939d5..99f05a9f83080 100644
--- a/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.12-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-static-ip-manager-release-4.12-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-static-ip-manager-release-4.12-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13-presubmits.yaml
index e192e300028b2..6425a5f16abd9 100644
--- a/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-static-ip-manager/openshift-ironic-static-ip-manager-release-4.13-presubmits.yaml
@@ -5,16 +5,17 @@ presubmits:
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
-    cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    cluster: build05
+    context: ci/prow/e2e-metal-ipi-bm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
+      ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ironic-static-ip-manager-release-4.13-e2e-metal-ipi
-    rerun_command: /test e2e-metal-ipi
+    name: pull-ci-openshift-ironic-static-ip-manager-release-4.13-e2e-metal-ipi-bm
+    rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-bm-cluster-profile
+        - --target=e2e-metal-ipi-bm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-bm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +73,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-bm,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12-presubmits.yaml
index 78792831c36cc..a745c7a54d594 100644
--- a/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.12-presubmits.yaml
@@ -79,16 +79,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-k8s-prometheus-adapter-release-4.12-e2e-aws
+    name: pull-ci-openshift-k8s-prometheus-adapter-release-4.12-e2e-aws-ovn
     path_alias: github.com/directxman12/k8s-prometheus-adapter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13-presubmits.yaml
index 8dc02f44ddab5..c87b363947460 100644
--- a/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.13-presubmits.yaml
@@ -79,16 +79,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-k8s-prometheus-adapter-release-4.13-e2e-aws
+    name: pull-ci-openshift-k8s-prometheus-adapter-release-4.13-e2e-aws-ovn
     path_alias: github.com/directxman12/k8s-prometheus-adapter
-    rerun_command: /test e2e-aws
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12-presubmits.yaml
index 24decd6f843bd..13f81b097e097 100644
--- a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-kube-rbac-proxy-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-kube-rbac-proxy-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13-presubmits.yaml
index af556bda0534a..efc0de1c97a86 100644
--- a/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-kube-rbac-proxy-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-kube-rbac-proxy-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12-presubmits.yaml
index 6b1609e44ac3c..6e1b115a05915 100644
--- a/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.12-presubmits.yaml
@@ -1,5 +1,52 @@
 presubmits:
   openshift/kubernetes-nmstate:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build02
+    context: ci/prow/check-generate-bundle
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-kubernetes-nmstate-release-4.12-check-generate-bundle
+    rerun_command: /test check-generate-bundle
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=check-generate-bundle
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )check-generate-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13-presubmits.yaml
index 03001a1c23d04..87791d0bc0328 100644
--- a/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kubernetes-nmstate/openshift-kubernetes-nmstate-release-4.13-presubmits.yaml
@@ -1,5 +1,52 @@
 presubmits:
   openshift/kubernetes-nmstate:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/check-generate-bundle
+    decorate: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-kubernetes-nmstate-release-4.13-check-generate-bundle
+    rerun_command: /test check-generate-bundle
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=check-generate-bundle
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - 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: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )check-generate-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12-presubmits.yaml
index d0279c2eb190e..46324e786b409 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.12-presubmits.yaml
@@ -6,15 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-disruptive
+    optional: true
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,23 +73,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-disruptive
-    optional: true
-    rerun_command: /test e2e-aws-disruptive
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -98,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -115,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -146,22 +146,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-operator-tech-preview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-operator-tech-preview
+    optional: true
+    rerun_command: /test e2e-aws-operator-tech-preview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -171,8 +172,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - --target=e2e-aws-operator-tech-preview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -188,7 +189,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -219,23 +220,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-operator-tech-preview
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-operator-tech-preview
-    optional: true
-    rerun_command: /test e2e-aws-operator-tech-preview
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -245,8 +245,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
-        - --target=e2e-aws-operator-tech-preview
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -262,7 +262,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -293,7 +293,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -373,16 +373,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-azure
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-azure-operator
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -392,8 +392,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -409,7 +409,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -440,23 +440,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-azure-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -466,8 +466,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -483,7 +483,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -514,23 +514,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-gcp
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-gcp-operator
     optional: true
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -540,8 +540,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
+        - --target=e2e-gcp-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -557,7 +557,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -592,23 +592,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp-operator
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-gcp-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-gcp-ovn
     optional: true
-    rerun_command: /test e2e-gcp-operator
+    rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -618,8 +618,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
-        - --target=e2e-gcp-operator
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -635,7 +635,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -670,7 +670,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -755,16 +755,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
     optional: true
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -774,8 +774,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -791,7 +791,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -822,23 +822,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
     optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -848,8 +848,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -865,7 +865,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -896,23 +896,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build02
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-machine-api-operator-release-4.12-e2e-metal-ipi-sdn
     optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -922,8 +922,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -939,7 +939,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -970,7 +970,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13-presubmits.yaml
index 97cb05726d79f..6e2dcd6bdbb88 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.13-presubmits.yaml
@@ -6,15 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-disruptive
+    optional: true
+    rerun_command: /test e2e-aws-disruptive
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -24,8 +25,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +42,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,23 +73,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-disruptive
-    optional: true
-    rerun_command: /test e2e-aws-disruptive
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-operator
+    rerun_command: /test e2e-aws-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -98,8 +98,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
+        - --target=e2e-aws-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -115,7 +115,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -146,22 +146,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-operator
+    context: ci/prow/e2e-aws-operator-tech-preview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-operator
-    rerun_command: /test e2e-aws-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-operator-tech-preview
+    optional: true
+    rerun_command: /test e2e-aws-operator-tech-preview
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -171,8 +172,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile
-        - --target=e2e-aws-operator
+        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - --target=e2e-aws-operator-tech-preview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -188,7 +189,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-cluster-profile
+        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -219,23 +220,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-operator-tech-preview
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-operator-tech-preview
-    optional: true
-    rerun_command: /test e2e-aws-operator-tech-preview
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -245,8 +245,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-operator-tech-preview-cluster-profile
-        - --target=e2e-aws-operator-tech-preview
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -262,7 +262,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-operator-tech-preview-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -293,7 +293,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-operator-tech-preview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -373,16 +373,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure
+    context: ci/prow/e2e-azure-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-azure
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-azure-operator
     optional: true
-    rerun_command: /test e2e-azure
+    rerun_command: /test e2e-azure-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -392,8 +392,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-cluster-profile
-        - --target=e2e-azure
+        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
+        - --target=e2e-azure-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -409,7 +409,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-cluster-profile
+        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -440,23 +440,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-azure-operator
+    context: ci/prow/e2e-azure-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-azure-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-azure-ovn
     optional: true
-    rerun_command: /test e2e-azure-operator
+    rerun_command: /test e2e-azure-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -466,8 +466,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-azure-operator-cluster-profile
-        - --target=e2e-azure-operator
+        - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile
+        - --target=e2e-azure-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -483,7 +483,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-azure-operator-cluster-profile
+        - mountPath: /usr/local/e2e-azure-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -514,23 +514,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-operator
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-gcp
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-gcp-operator
     optional: true
-    rerun_command: /test e2e-gcp
+    rerun_command: /test e2e-gcp-operator
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -540,8 +540,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
+        - --target=e2e-gcp-operator
         command:
         - ci-operator
         image: ci-operator:latest
@@ -557,7 +557,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -592,23 +592,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-operator
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-gcp-operator
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-gcp-ovn
     optional: true
-    rerun_command: /test e2e-gcp-operator
+    rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -618,8 +618,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-operator-cluster-profile
-        - --target=e2e-gcp-operator
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -635,7 +635,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-operator-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -670,7 +670,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -755,16 +755,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi
+    context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
     optional: true
-    rerun_command: /test e2e-metal-ipi
+    rerun_command: /test e2e-metal-ipi-ovn-dualstack
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -774,8 +774,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile
-        - --target=e2e-metal-ipi
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - --target=e2e-metal-ipi-ovn-dualstack
         command:
         - ci-operator
         image: ci-operator:latest
@@ -791,7 +791,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -822,23 +822,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-dualstack
+    context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
     optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-dualstack
+    rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -848,8 +848,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
-        - --target=e2e-metal-ipi-ovn-dualstack
+        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - --target=e2e-metal-ipi-ovn-ipv6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -865,7 +865,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -896,23 +896,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-metal-ipi-ovn-ipv6
+    context: ci/prow/e2e-metal-ipi-sdn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: equinix-ocp-metal
       ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-machine-api-operator-release-4.13-e2e-metal-ipi-sdn
     optional: true
-    rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    rerun_command: /test e2e-metal-ipi-sdn
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -922,8 +922,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
-        - --target=e2e-metal-ipi-ovn-ipv6
+        - --secret-dir=/usr/local/e2e-metal-ipi-sdn-cluster-profile
+        - --target=e2e-metal-ipi-sdn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -939,7 +939,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
+        - mountPath: /usr/local/e2e-metal-ipi-sdn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -970,7 +970,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-ipi-sdn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13-presubmits.yaml
index ddf4a46d11612..5b11409f11596 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13-presubmits.yaml
@@ -2640,6 +2640,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
+        - --target=[release:latest]
         - --variant=okd
         command:
         - ci-operator
diff --git a/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.12-presubmits.yaml
index 46524a9f5aa3a..fd73d73b07d1b 100644
--- a/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-network-tools-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-network-tools-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.13-presubmits.yaml
index 6ca2e0785a6f9..61c7333c36fca 100644
--- a/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/network-tools/openshift-network-tools-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-network-tools-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-network-tools-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -71,7 +71,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.12-presubmits.yaml
index ef755754deea0..599786afeb8ef 100644
--- a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.12-presubmits.yaml
@@ -120,20 +120,21 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oc-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-oc-release-4.12-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
     spec:
       containers:
       - args:
@@ -142,8 +143,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -159,7 +160,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -190,23 +191,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oc-release-4.12-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
+    name: pull-ci-openshift-oc-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -215,8 +215,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -232,7 +232,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -263,7 +263,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.13-presubmits.yaml
index faae00556c81b..09d68dadbe2ae 100644
--- a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.13-presubmits.yaml
@@ -120,20 +120,21 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oc-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-oc-release-4.13-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
     spec:
       containers:
       - args:
@@ -142,8 +143,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -159,7 +160,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -190,23 +191,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-oc-release-4.13-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/.*build.*)|^(pkg/.*newapp.*)
+    name: pull-ci-openshift-oc-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -215,8 +215,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -232,7 +232,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -263,7 +263,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12-presubmits.yaml
index 321e8645acf69..868bd0f6ade92 100644
--- a/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12-presubmits.yaml
@@ -1,12 +1,12 @@
 presubmits:
   openshift/okd-machine-os:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-crun
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -15,8 +15,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-okd-machine-os-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-okd-machine-os-release-4.12-e2e-aws-crun
+    optional: true
+    rerun_command: /test e2e-aws-crun
     spec:
       containers:
       - args:
@@ -25,8 +26,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-crun-cluster-profile
+        - --target=e2e-aws-crun
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +43,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-crun-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,14 +74,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-crun,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws-crun
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -89,9 +90,8 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-okd-machine-os-release-4.12-e2e-aws-crun
-    optional: true
-    rerun_command: /test e2e-aws-crun
+    name: pull-ci-openshift-okd-machine-os-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -100,8 +100,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-crun-cluster-profile
-        - --target=e2e-aws-crun
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -117,7 +117,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-crun-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -148,7 +148,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-crun,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13-presubmits.yaml
index cd27d6792d908..c050d0b16617e 100644
--- a/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13-presubmits.yaml
@@ -1,12 +1,12 @@
 presubmits:
   openshift/okd-machine-os:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-crun
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -15,8 +15,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-okd-machine-os-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-okd-machine-os-release-4.13-e2e-aws-crun
+    optional: true
+    rerun_command: /test e2e-aws-crun
     spec:
       containers:
       - args:
@@ -25,8 +26,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-crun-cluster-profile
+        - --target=e2e-aws-crun
         command:
         - ci-operator
         image: ci-operator:latest
@@ -42,7 +43,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-crun-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -73,14 +74,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-crun,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws-crun
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -89,9 +90,8 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-okd-machine-os-release-4.13-e2e-aws-crun
-    optional: true
-    rerun_command: /test e2e-aws-crun
+    name: pull-ci-openshift-okd-machine-os-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -100,8 +100,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-crun-cluster-profile
-        - --target=e2e-aws-crun
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -117,7 +117,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-crun-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -148,7 +148,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-crun,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12-presubmits.yaml
index 8021fb9c4daa2..08cfa854fb617 100644
--- a/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.12-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-controller-manager-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-openshift-controller-manager-release-4.12-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/build)
     spec:
       containers:
       - args:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,23 +72,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-controller-manager-release-4.12-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/build)
+    name: pull-ci-openshift-openshift-controller-manager-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13-presubmits.yaml
index 282f604691215..418c6adf410af 100644
--- a/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.13-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-controller-manager-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    name: pull-ci-openshift-openshift-controller-manager-release-4.13-e2e-aws-builds
+    rerun_command: /test e2e-aws-builds
+    run_if_changed: ^(pkg/build)
     spec:
       containers:
       - args:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
+        - --target=e2e-aws-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,23 +72,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build03
-    context: ci/prow/e2e-aws-builds
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-controller-manager-release-4.13-e2e-aws-builds
-    rerun_command: /test e2e-aws-builds
-    run_if_changed: ^(pkg/build)
+    name: pull-ci-openshift-openshift-controller-manager-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -97,8 +97,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-builds-cluster-profile
-        - --target=e2e-aws-builds
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -114,7 +114,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-builds-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -145,7 +145,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12-presubmits.yaml
index 29469aa15e400..95246972d183c 100644
--- a/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.12-presubmits.yaml
@@ -125,15 +125,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-state-metrics-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-openshift-state-metrics-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -142,8 +142,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -159,7 +159,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -190,7 +190,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13-presubmits.yaml
index cd521b9785fb2..5ca30ac96f720 100644
--- a/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-state-metrics/openshift-openshift-state-metrics-release-4.13-presubmits.yaml
@@ -125,15 +125,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-openshift-state-metrics-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-openshift-state-metrics-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -142,8 +142,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -159,7 +159,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -190,7 +190,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml
index 1a7afe3d3fddf..ccea628f8793c 100644
--- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-console-olm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-console-olm
+    rerun_command: /test e2e-gcp-console-olm
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
+        - --target=e2e-gcp-console-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -75,22 +75,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp-console-olm
+    context: ci/prow/e2e-gcp-olm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-console-olm
-    rerun_command: /test e2e-gcp-console-olm
+    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-olm
+    rerun_command: /test e2e-gcp-olm
     spec:
       containers:
       - args:
@@ -99,8 +99,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
-        - --target=e2e-gcp-console-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
+        - --target=e2e-gcp-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -116,7 +116,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -151,22 +151,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp-olm
+    context: ci/prow/e2e-gcp-olm-flaky
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-olm
-    rerun_command: /test e2e-gcp-olm
+    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-olm-flaky
+    optional: true
+    rerun_command: /test e2e-gcp-olm-flaky
     spec:
       containers:
       - args:
@@ -175,8 +176,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
-        - --target=e2e-gcp-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - --target=e2e-gcp-olm-flaky
         command:
         - ci-operator
         image: ci-operator:latest
@@ -192,7 +193,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -227,23 +228,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build04
-    context: ci/prow/e2e-gcp-olm-flaky
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-olm-flaky
-    optional: true
-    rerun_command: /test e2e-gcp-olm-flaky
+    name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -252,8 +252,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
-        - --target=e2e-gcp-olm-flaky
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -269,7 +269,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -304,7 +304,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13-presubmits.yaml
index 570e8e3774644..ddaeeacbdce13 100644
--- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.13-presubmits.yaml
@@ -6,15 +6,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-console-olm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-console-olm
+    rerun_command: /test e2e-gcp-console-olm
     spec:
       containers:
       - args:
@@ -23,8 +23,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
+        - --target=e2e-gcp-console-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -40,7 +40,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -75,22 +75,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-console-olm
+    context: ci/prow/e2e-gcp-olm
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-console-olm
-    rerun_command: /test e2e-gcp-console-olm
+    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-olm
+    rerun_command: /test e2e-gcp-olm
     spec:
       containers:
       - args:
@@ -99,8 +99,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-console-olm-cluster-profile
-        - --target=e2e-gcp-console-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
+        - --target=e2e-gcp-olm
         command:
         - ci-operator
         image: ci-operator:latest
@@ -116,7 +116,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-console-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -151,22 +151,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-console-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-olm
+    context: ci/prow/e2e-gcp-olm-flaky
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-olm
-    rerun_command: /test e2e-gcp-olm
+    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-olm-flaky
+    optional: true
+    rerun_command: /test e2e-gcp-olm-flaky
     spec:
       containers:
       - args:
@@ -175,8 +176,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-cluster-profile
-        - --target=e2e-gcp-olm
+        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - --target=e2e-gcp-olm-flaky
         command:
         - ci-operator
         image: ci-operator:latest
@@ -192,7 +193,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -227,23 +228,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-olm-flaky
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-olm-flaky
-    optional: true
-    rerun_command: /test e2e-gcp-olm-flaky
+    name: pull-ci-openshift-operator-framework-olm-release-4.13-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -252,8 +252,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-olm-flaky-cluster-profile
-        - --target=e2e-gcp-olm-flaky
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -269,7 +269,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-olm-flaky-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -304,7 +304,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-olm-flaky,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.13-presubmits.yaml
index 6d242028d3255..65860f4f91e3a 100644
--- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.13-presubmits.yaml
@@ -6,16 +6,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-agnostic-cmd
+    context: ci/prow/e2e-agnostic-ovn-cmd
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-agnostic-cmd
+    name: pull-ci-openshift-origin-release-4.13-e2e-agnostic-ovn-cmd
     optional: true
-    rerun_command: /test e2e-agnostic-cmd
+    rerun_command: /test e2e-agnostic-ovn-cmd
     spec:
       containers:
       - args:
@@ -24,8 +24,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-cmd-cluster-profile
-        - --target=e2e-agnostic-cmd
+        - --secret-dir=/usr/local/e2e-agnostic-ovn-cmd-cluster-profile
+        - --target=e2e-agnostic-ovn-cmd
         command:
         - ci-operator
         image: ci-operator:latest
@@ -41,7 +41,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-cmd-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-ovn-cmd-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -72,7 +72,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-ovn-cmd,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -152,16 +152,16 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-cgroupsv2
+    context: ci/prow/e2e-aws-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-cgroupsv2
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-csi
     optional: true
-    rerun_command: /test e2e-aws-cgroupsv2
+    rerun_command: /test e2e-aws-csi
     spec:
       containers:
       - args:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cgroupsv2-cluster-profile
-        - --target=e2e-aws-cgroupsv2
+        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
+        - --target=e2e-aws-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cgroupsv2-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -211,30 +211,30 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-cgroupsv2,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-csi
+    context: ci/prow/e2e-aws-csi-migration
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-csi
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-csi-migration
     optional: true
-    rerun_command: /test e2e-aws-csi
+    rerun_command: /test e2e-aws-csi-migration
     spec:
       containers:
       - args:
@@ -243,8 +243,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-cluster-profile
-        - --target=e2e-aws-csi
+        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
+        - --target=e2e-aws-csi-migration
         command:
         - ci-operator
         image: ci-operator:latest
@@ -260,7 +260,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-cluster-profile
+        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -284,30 +284,30 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-csi-migration
+    context: ci/prow/e2e-aws-disruptive
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-csi-migration
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-disruptive
     optional: true
-    rerun_command: /test e2e-aws-csi-migration
+    rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
       - args:
@@ -316,8 +316,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-csi-migration-cluster-profile
-        - --target=e2e-aws-csi-migration
+        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
+        - --target=e2e-aws-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -333,7 +333,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-csi-migration-cluster-profile
+        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -357,30 +357,30 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-csi-migration,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-disruptive
+    context: ci/prow/e2e-aws-image-registry
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-disruptive
-    optional: true
-    rerun_command: /test e2e-aws-disruptive
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-image-registry
+    rerun_command: /test e2e-aws-image-registry
+    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
     spec:
       containers:
       - args:
@@ -389,8 +389,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile
-        - --target=e2e-aws-disruptive
+        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
+        - --target=e2e-aws-image-registry
         command:
         - ci-operator
         image: ci-operator:latest
@@ -406,7 +406,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -437,22 +437,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-fips
+    context: ci/prow/e2e-aws-jenkins
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-fips
-    rerun_command: /test e2e-aws-fips
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-jenkins
+    rerun_command: /test e2e-aws-jenkins
+    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
     spec:
       containers:
       - args:
@@ -461,8 +462,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile
-        - --target=e2e-aws-fips
+        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
+        - --target=e2e-aws-jenkins
         command:
         - ci-operator
         image: ci-operator:latest
@@ -478,7 +479,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-fips-cluster-profile
+        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -509,23 +510,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-image-registry
+    context: ci/prow/e2e-aws-multitenant
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-image-registry
-    rerun_command: /test e2e-aws-image-registry
-    run_if_changed: ^(pkg/image)|^(test/extended/registry)|^(test/extended/images)|^(test/extended/imageapis)|^(vendor/github.com/docker/distribution)
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-multitenant
+    optional: true
+    rerun_command: /test e2e-aws-multitenant
     spec:
       containers:
       - args:
@@ -534,8 +535,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-image-registry-cluster-profile
-        - --target=e2e-aws-image-registry
+        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
+        - --target=e2e-aws-multitenant
         command:
         - ci-operator
         image: ci-operator:latest
@@ -551,7 +552,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile
+        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -582,23 +583,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-image-registry,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-jenkins
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-jenkins
-    rerun_command: /test e2e-aws-jenkins
-    run_if_changed: ^(test/extended/builds/pipeline_jenkins_e2e.go)|^(test/extended/testdata/jenkins-plugin)|^(examples/jenkins)
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn
+    optional: true
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -607,8 +608,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-jenkins-cluster-profile
-        - --target=e2e-aws-jenkins
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -624,7 +625,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -655,23 +656,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-multitenant
+    context: ci/prow/e2e-aws-ovn-cgroupsv2
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-multitenant
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-cgroupsv2
     optional: true
-    rerun_command: /test e2e-aws-multitenant
+    rerun_command: /test e2e-aws-ovn-cgroupsv2
     spec:
       containers:
       - args:
@@ -680,8 +681,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile
-        - --target=e2e-aws-multitenant
+        - --secret-dir=/usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
+        - --target=e2e-aws-ovn-cgroupsv2
         command:
         - ci-operator
         image: ci-operator:latest
@@ -697,7 +698,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cgroupsv2-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -721,30 +722,29 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-cgroupsv2,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-ovn
+    context: ci/prow/e2e-aws-ovn-fips
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn
-    optional: true
-    rerun_command: /test e2e-aws-ovn
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-fips
+    rerun_command: /test e2e-aws-ovn-fips
     spec:
       containers:
       - args:
@@ -753,8 +753,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
-        - --target=e2e-aws-ovn
+        - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile
+        - --target=e2e-aws-ovn-fips
         command:
         - ci-operator
         image: ci-operator:latest
@@ -770,7 +770,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -801,23 +801,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-proxy
+    context: ci/prow/e2e-aws-ovn-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-proxy
-    optional: true
-    rerun_command: /test e2e-aws-proxy
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-serial
+    rerun_command: /test e2e-aws-ovn-serial
     spec:
       containers:
       - args:
@@ -826,8 +825,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
-        - --target=e2e-aws-proxy
+        - --secret-dir=/usr/local/e2e-aws-ovn-serial-cluster-profile
+        - --target=e2e-aws-ovn-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -843,7 +842,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -867,29 +866,30 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws
+          secretName: cluster-secrets-aws-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-serial,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-serial
+    context: ci/prow/e2e-aws-ovn-single-node
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-serial
-    rerun_command: /test e2e-aws-serial
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-single-node
+    optional: true
+    rerun_command: /test e2e-aws-ovn-single-node
     spec:
       containers:
       - args:
@@ -898,8 +898,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
-        - --target=e2e-aws-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile
+        - --target=e2e-aws-ovn-single-node
         command:
         - ci-operator
         image: ci-operator:latest
@@ -915,7 +915,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -946,23 +946,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-single-node
+    context: ci/prow/e2e-aws-ovn-single-node-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-single-node
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-single-node-serial
     optional: true
-    rerun_command: /test e2e-aws-single-node
+    rerun_command: /test e2e-aws-ovn-single-node-serial
     spec:
       containers:
       - args:
@@ -971,8 +971,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile
-        - --target=e2e-aws-single-node
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
+        - --target=e2e-aws-ovn-single-node-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -988,7 +988,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1019,23 +1019,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-single-node-serial
+    context: ci/prow/e2e-aws-ovn-single-node-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-single-node-serial
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-ovn-single-node-upgrade
     optional: true
-    rerun_command: /test e2e-aws-single-node-serial
+    rerun_command: /test e2e-aws-ovn-single-node-upgrade
     spec:
       containers:
       - args:
@@ -1044,8 +1044,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-serial-cluster-profile
-        - --target=e2e-aws-single-node-serial
+        - --secret-dir=/usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
+        - --target=e2e-aws-ovn-single-node-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1061,7 +1061,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-serial-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-single-node-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1092,23 +1092,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws-single-node-upgrade
+    context: ci/prow/e2e-aws-proxy
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-2
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-aws-single-node-upgrade
+    name: pull-ci-openshift-origin-release-4.13-e2e-aws-proxy
     optional: true
-    rerun_command: /test e2e-aws-single-node-upgrade
+    rerun_command: /test e2e-aws-proxy
     spec:
       containers:
       - args:
@@ -1117,8 +1117,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-single-node-upgrade-cluster-profile
-        - --target=e2e-aws-single-node-upgrade
+        - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile
+        - --target=e2e-aws-proxy
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1134,7 +1134,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-single-node-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-aws-proxy-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1158,14 +1158,14 @@ presubmits:
           secretName: ci-pull-credentials
       - name: cluster-profile
         secret:
-          secretName: cluster-secrets-aws-2
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-single-node-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -1313,20 +1313,21 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp
+    context: ci/prow/e2e-gcp-builds
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp
-    rerun_command: /test e2e-gcp
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-builds
+    rerun_command: /test e2e-gcp-builds
+    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1335,8 +1336,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
-        - --target=e2e-gcp
+        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
+        - --target=e2e-gcp-builds
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1352,7 +1353,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1387,23 +1388,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-builds
+    context: ci/prow/e2e-gcp-csi
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-builds
-    rerun_command: /test e2e-gcp-builds
-    run_if_changed: ^(pkg/oc/cli/startbuild/startbuild.go)|^(pkg/build)|^(staging/src/.*/pkg/.*build)|^(pkg/cmd/infra/builder)|^(test/extended/builds)|^(test/extended/testdata/builds)|^(test/extended/util)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-csi
+    optional: true
+    rerun_command: /test e2e-gcp-csi
     spec:
       containers:
       - args:
@@ -1412,8 +1413,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-builds-cluster-profile
-        - --target=e2e-gcp-builds
+        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
+        - --target=e2e-gcp-csi
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1429,7 +1430,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-builds-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1464,23 +1465,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-builds,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-csi
+    context: ci/prow/e2e-gcp-disruptive
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-csi
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-disruptive
     optional: true
-    rerun_command: /test e2e-gcp-csi
+    rerun_command: /test e2e-gcp-disruptive
     spec:
       containers:
       - args:
@@ -1489,8 +1490,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-csi-cluster-profile
-        - --target=e2e-gcp-csi
+        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
+        - --target=e2e-gcp-disruptive
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1506,7 +1507,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-csi-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1541,23 +1542,23 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-disruptive
+    context: ci/prow/e2e-gcp-fips-serial
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-disruptive
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-fips-serial
     optional: true
-    rerun_command: /test e2e-gcp-disruptive
+    rerun_command: /test e2e-gcp-fips-serial
     spec:
       containers:
       - args:
@@ -1566,8 +1567,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-disruptive-cluster-profile
-        - --target=e2e-gcp-disruptive
+        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
+        - --target=e2e-gcp-fips-serial
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1583,7 +1584,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-disruptive-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1609,32 +1610,32 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
+              name: cluster-secrets-gcp
           - configMap:
-              name: cluster-profile-gcp-openshift-gce-devel-ci-2
+              name: cluster-profile-gcp
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-fips-serial
+    context: ci/prow/e2e-gcp-image-ecosystem
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
-      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-fips-serial
-    optional: true
-    rerun_command: /test e2e-gcp-fips-serial
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-image-ecosystem
+    rerun_command: /test e2e-gcp-image-ecosystem
+    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
     spec:
       containers:
       - args:
@@ -1643,8 +1644,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-fips-serial-cluster-profile
-        - --target=e2e-gcp-fips-serial
+        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - --target=e2e-gcp-image-ecosystem
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1660,7 +1661,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-fips-serial-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1686,32 +1687,31 @@ presubmits:
         projected:
           sources:
           - secret:
-              name: cluster-secrets-gcp
+              name: cluster-secrets-gcp-openshift-gce-devel-ci-2
           - configMap:
-              name: cluster-profile-gcp
+              name: cluster-profile-gcp-openshift-gce-devel-ci-2
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-fips-serial,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-image-ecosystem
+    context: ci/prow/e2e-gcp-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-image-ecosystem
-    rerun_command: /test e2e-gcp-image-ecosystem
-    run_if_changed: ^(test/extended/image_ecosystem)|^(examples/db-templates)|^(examples/quickstarts)|^(examples/image-streams)|^(examples/jenkins)|^(vendor/github.com/openshift/source-to-image)|^(vendor/github.com/openshift/imagebuilder)
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-ovn
+    rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
       - args:
@@ -1720,8 +1720,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-image-ecosystem-cluster-profile
-        - --target=e2e-gcp-image-ecosystem
+        - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile
+        - --target=e2e-gcp-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1737,7 +1737,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1772,7 +1772,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-image-ecosystem,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1856,15 +1856,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build04
-    context: ci/prow/e2e-gcp-upgrade
+    context: ci/prow/e2e-gcp-ovn-upgrade
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp-openshift-gce-devel-ci-2
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-upgrade
-    rerun_command: /test e2e-gcp-upgrade
+    name: pull-ci-openshift-origin-release-4.13-e2e-gcp-ovn-upgrade
+    rerun_command: /test e2e-gcp-ovn-upgrade
     spec:
       containers:
       - args:
@@ -1873,8 +1873,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile
-        - --target=e2e-gcp-upgrade
+        - --secret-dir=/usr/local/e2e-gcp-ovn-upgrade-cluster-profile
+        - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1890,7 +1890,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-gcp-ovn-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -1925,7 +1925,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-gcp-ovn-upgrade,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12-presubmits.yaml
index 2b020615cdb0c..8ef2ba1f62af2 100644
--- a/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.12-presubmits.yaml
@@ -80,7 +80,7 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -89,8 +89,8 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-prometheus-alertmanager-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-prometheus-alertmanager-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -99,8 +99,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -116,7 +116,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -147,7 +147,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13-presubmits.yaml
index d675d077d2074..7abac93c34fb8 100644
--- a/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.13-presubmits.yaml
@@ -80,7 +80,7 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build05
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -89,8 +89,8 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-prometheus-alertmanager-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-prometheus-alertmanager-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -99,8 +99,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -116,7 +116,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -147,7 +147,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.12-presubmits.yaml
index 31e37e7b84dd1..72675824860d6 100644
--- a/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.12-presubmits.yaml
@@ -53,15 +53,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ptp-operator-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-ptp-operator-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -70,8 +70,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -87,7 +87,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -118,7 +118,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.13-presubmits.yaml
index d54611b6c7e4c..806d62b127ce2 100644
--- a/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ptp-operator/openshift-ptp-operator-release-4.13-presubmits.yaml
@@ -53,15 +53,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-ptp-operator-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-ptp-operator-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -70,8 +70,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -87,7 +87,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -118,7 +118,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-postsubmits.yaml
new file mode 100644
index 0000000000000..5aea157aa7e9a
--- /dev/null
+++ b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-postsubmits.yaml
@@ -0,0 +1,54 @@
+postsubmits:
+  openshift/route-controller-manager:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    cluster: build01
+    decorate: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-route-controller-manager-release-4.12-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-presubmits.yaml b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-presubmits.yaml
similarity index 64%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-presubmits.yaml
rename to ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-presubmits.yaml
index 7fd9a1b54c935..074187b970c1c 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.12-presubmits.yaml
@@ -1,31 +1,31 @@
 presubmits:
-  openshift-priv/cincinnati:
+  openshift/route-controller-manager:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^release-4\.12$
+    - ^release-4\.12-
     cluster: build01
-    context: ci/prow/cargo-test
+    context: ci/prow/e2e-aws-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
+    name: pull-ci-openshift-route-controller-manager-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,15 +35,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -52,49 +54,51 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^release-4\.12$
+    - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
+    name: pull-ci-openshift-route-controller-manager-release-4.12-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -110,14 +114,11 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -138,41 +139,39 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build01
-    context: ci/prow/images
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: build04
+    context: ci/prow/e2e-gcp
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
+    name: pull-ci-openshift-route-controller-manager-release-4.12-e2e-gcp
+    rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -182,12 +181,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -196,41 +200,49 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^release-4\.12$
+    - ^release-4\.12-
     cluster: build01
-    context: ci/prow/rustfmt-1.54.0
+    context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
+    name: pull-ci-openshift-route-controller-manager-release-4.12-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -243,9 +255,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -254,41 +263,34 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^release-4\.12$
+    - ^release-4\.12-
     cluster: build01
-    context: ci/prow/rustfmt-1.58.0
+    context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
+    name: pull-ci-openshift-route-controller-manager-release-4.12-unit
+    rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
+        - --target=unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -301,9 +303,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -312,41 +311,34 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^release-4\.12$
+    - ^release-4\.12-
     cluster: build01
-    context: ci/prow/yaml-lint
+    context: ci/prow/verify
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-master-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
+    name: pull-ci-openshift-route-controller-manager-release-4.12-verify
+    rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
+        - --target=verify
         command:
         - ci-operator
         image: ci-operator:latest
@@ -359,9 +351,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -370,13 +359,10 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-postsubmits.yaml
new file mode 100644
index 0000000000000..a7d8035e867db
--- /dev/null
+++ b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-postsubmits.yaml
@@ -0,0 +1,54 @@
+postsubmits:
+  openshift/route-controller-manager:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    cluster: build01
+    decorate: true
+    labels:
+      ci-operator.openshift.io/is-promotion: "true"
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-openshift-route-controller-manager-release-4.13-images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-presubmits.yaml
similarity index 64%
rename from ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-presubmits.yaml
rename to ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-presubmits.yaml
index 675bfcac7ae62..6168b4009a29e 100644
--- a/ci-operator/jobs/openshift-priv/cincinnati/openshift-priv-cincinnati-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/route-controller-manager/openshift-route-controller-manager-release-4.13-presubmits.yaml
@@ -1,31 +1,31 @@
 presubmits:
-  openshift-priv/cincinnati:
+  openshift/route-controller-manager:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
+    - ^release-4\.13$
+    - ^release-4\.13-
     cluster: build01
-    context: ci/prow/cargo-test
+    context: ci/prow/e2e-aws-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-cargo-test
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test cargo-test
+    name: pull-ci-openshift-route-controller-manager-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=cargo-test
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -35,15 +35,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -52,49 +54,51 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
       - name: ci-pull-credentials
         secret:
           secretName: ci-pull-credentials
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: cluster-profile
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          secretName: cluster-secrets-aws
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )cargo-test,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
-    cluster: build05
-    context: ci/prow/e2e
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build01
+    context: ci/prow/e2e-aws-upgrade
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-e2e
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test e2e
+    name: pull-ci-openshift-route-controller-manager-release-4.13-e2e-aws-upgrade
+    rerun_command: /test e2e-aws-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-cluster-profile
-        - --target=e2e
+        - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
+        - --target=e2e-aws-upgrade
         command:
         - ci-operator
         image: ci-operator:latest
@@ -110,14 +114,11 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-cluster-profile
+        - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -138,41 +139,39 @@ presubmits:
       - name: cluster-profile
         secret:
           secretName: cluster-secrets-aws
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
-    cluster: build01
-    context: ci/prow/images
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: build04
+    context: ci/prow/e2e-gcp
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-images
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test images
+    name: pull-ci-openshift-route-controller-manager-release-4.13-e2e-gcp
+    rerun_command: /test e2e-gcp
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-gcp-cluster-profile
+        - --target=e2e-gcp
         command:
         - ci-operator
         image: ci-operator:latest
@@ -182,12 +181,17 @@ presubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-gcp-cluster-profile
+          name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -196,41 +200,50 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
+      - name: boskos
         secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-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( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
+    - ^release-4\.13$
+    - ^release-4\.13-
     cluster: build01
-    context: ci/prow/rustfmt-1.54.0
+    context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-rustfmt-1.54.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.54.0
+    name: pull-ci-openshift-route-controller-manager-release-4.13-images
+    rerun_command: /test images
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.54.0
+        - --target=[images]
+        - --target=[release:latest]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -243,9 +256,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -254,41 +264,34 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.54.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
+    - ^release-4\.13$
+    - ^release-4\.13-
     cluster: build01
-    context: ci/prow/rustfmt-1.58.0
+    context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-rustfmt-1.58.0
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test rustfmt-1.58.0
+    name: pull-ci-openshift-route-controller-manager-release-4.13-unit
+    rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=rustfmt-1.58.0
+        - --target=unit
         command:
         - ci-operator
         image: ci-operator:latest
@@ -301,9 +304,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -312,41 +312,34 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rustfmt-1.58.0,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
-    - ^release-4\.9$
-    - ^release-4\.9-
+    - ^release-4\.13$
+    - ^release-4\.13-
     cluster: build01
-    context: ci/prow/yaml-lint
+    context: ci/prow/verify
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    hidden: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-cincinnati-release-4.9-yaml-lint
-    path_alias: github.com/openshift/cincinnati
-    rerun_command: /test yaml-lint
+    name: pull-ci-openshift-route-controller-manager-release-4.13-verify
+    rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
-        - --target=yaml-lint
+        - --target=verify
         command:
         - ci-operator
         image: ci-operator:latest
@@ -359,9 +352,6 @@ presubmits:
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
-        - mountPath: /usr/local/github-credentials
-          name: github-credentials-openshift-ci-robot-private-git-cloner
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -370,13 +360,10 @@ presubmits:
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: github-credentials-openshift-ci-robot-private-git-cloner
-        secret:
-          secretName: github-credentials-openshift-ci-robot-private-git-cloner
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )yaml-lint,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify,?($|\s.*)
diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.12-presubmits.yaml
index f02c772ed768d..f6008d6ebd324 100644
--- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.12-presubmits.yaml
@@ -78,15 +78,15 @@ presubmits:
     - ^release-4\.12$
     - ^release-4\.12-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-telemeter-release-4.12-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-telemeter-release-4.12-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.13-presubmits.yaml
index cf639208b9f61..933fec9279a29 100644
--- a/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/telemeter/openshift-telemeter-release-4.13-presubmits.yaml
@@ -78,15 +78,15 @@ presubmits:
     - ^release-4\.13$
     - ^release-4\.13-
     cluster: build01
-    context: ci/prow/e2e-aws
+    context: ci/prow/e2e-aws-ovn
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-telemeter-release-4.13-e2e-aws
-    rerun_command: /test e2e-aws
+    name: pull-ci-openshift-telemeter-release-4.13-e2e-aws-ovn
+    rerun_command: /test e2e-aws-ovn
     spec:
       containers:
       - args:
@@ -95,8 +95,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-aws-cluster-profile
-        - --target=e2e-aws
+        - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile
+        - --target=e2e-aws-ovn
         command:
         - ci-operator
         image: ci-operator:latest
@@ -112,7 +112,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-aws-cluster-profile
+        - mountPath: /usr/local/e2e-aws-ovn-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -143,7 +143,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12-presubmits.yaml
index e82cd21660a96..8f8099e04755e 100644
--- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12-presubmits.yaml
@@ -755,6 +755,79 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.12$
+    - ^release-4\.12-
+    cluster: vsphere
+    context: ci/prow/vsphere-e2e-ccm-install
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-windows-machine-config-operator-release-4.12-vsphere-e2e-ccm-install
+    optional: true
+    rerun_command: /test vsphere-e2e-ccm-install
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/vsphere-e2e-ccm-install-cluster-profile
+        - --target=vsphere-e2e-ccm-install
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/vsphere-e2e-ccm-install-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )vsphere-e2e-ccm-install,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13-presubmits.yaml
index 345b93f7d138f..cc144909882b5 100644
--- a/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13-presubmits.yaml
@@ -756,6 +756,79 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.13$
+    - ^release-4\.13-
+    cluster: vsphere
+    context: ci/prow/vsphere-e2e-ccm-install
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-windows-machine-config-operator-release-4.13-vsphere-e2e-ccm-install
+    optional: true
+    rerun_command: /test vsphere-e2e-ccm-install
+    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=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/vsphere-e2e-ccm-install-cluster-profile
+        - --target=vsphere-e2e-ccm-install
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/vsphere-e2e-ccm-install-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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )vsphere-e2e-ccm-install,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml
index 5bee0c8a4ec2b..92fb7df3c8562 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-eu-west-1
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-11-amd64-aws-eu-west-2_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-11-amd64-aws-eu-west-2_clusterpool.yaml
index 75f76f847eb51..16baf5bcb1b17 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-11-amd64-aws-eu-west-2_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-11-amd64-aws-eu-west-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0
+    name: ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-eu-west-2
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-6-amd64-aws-us-west-1_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-6-amd64-aws-us-west-1_clusterpool.yaml
index bfaad766e55a2..9ce0abb824331 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-6-amd64-aws-us-west-1_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-6-amd64-aws-us-west-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0
+    name: ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-west-1
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-7-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-7-amd64-aws-us-east-1_clusterpool.yaml
index 27335a20384ba..f5d7b9347efbc 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-7-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-7-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0
+    name: ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml
index 88c931cdaaded..809a126fbef48 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0
+    name: ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2
diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-9-amd64-aws-us-west-2_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-9-amd64-aws-us-west-2_clusterpool.yaml
index bffb8973edf85..a5ea3165ba831 100644
--- a/clusters/hive/pools/cvp/cvp-ocp-4-9-amd64-aws-us-west-2_clusterpool.yaml
+++ b/clusters/hive/pools/cvp/cvp-ocp-4-9-amd64-aws-us-west-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0
+    name: ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-west-2
diff --git a/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml
index 5488ca15884e8..0abe5b11bc9be 100644
--- a/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml
+++ b/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-medium-aws-us-east-1
diff --git a/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml
index 30b8c6ee92794..9af8bc38478c0 100644
--- a/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml
+++ b/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-small-aws-us-east-2
diff --git a/clusters/hive/pools/msp/msp-ocp-4-11-medium-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-11-medium-single-az-aws_clusterpool.yaml
index 7f2bddf68eda7..8a4c965482ebd 100644
--- a/clusters/hive/pools/msp/msp-ocp-4-11-medium-single-az-aws_clusterpool.yaml
+++ b/clusters/hive/pools/msp/msp-ocp-4-11-medium-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0
+    name: ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-medium-aws-us-east-1
diff --git a/clusters/hive/pools/msp/msp-ocp-4-11-small-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-11-small-single-az-aws_clusterpool.yaml
index 97361531389f5..4ed3e36e7ef06 100644
--- a/clusters/hive/pools/msp/msp-ocp-4-11-small-single-az-aws_clusterpool.yaml
+++ b/clusters/hive/pools/msp/msp-ocp-4-11-small-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0
+    name: ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-small-aws-us-east-2
diff --git a/clusters/hive/pools/ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml
similarity index 57%
rename from clusters/hive/pools/ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml
index 235cb37660124..cee12f102fb1f 100644
--- a/clusters/hive/pools/ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.10.0-0
     version_upper: 4.11.0-0
   creationTimestamp: null
-  name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+  name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.10.28-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.10.32-x86_64
 status: {}
diff --git a/clusters/hive/pools/ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml
similarity index 60%
rename from clusters/hive/pools/ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml
index 9205a4bd0d2b2..a5d58824da2e4 100644
--- a/clusters/hive/pools/ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.11.0-0
     version_upper: 4.12.0-0
   creationTimestamp: null
-  name: ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0
+  name: ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.11.1-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.11.4-x86_64
 status: {}
diff --git a/clusters/hive/pools/ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml
similarity index 60%
rename from clusters/hive/pools/ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml
index fe36e2cdda026..4fac84bbafa90 100644
--- a/clusters/hive/pools/ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.6.0-0
     version_upper: 4.7.0-0
   creationTimestamp: null
-  name: ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0
+  name: ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.6.60-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.6.61-x86_64
 status: {}
diff --git a/clusters/hive/pools/ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml
similarity index 60%
rename from clusters/hive/pools/ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml
index 196e1d5d3c8dc..280dd36ba1505 100644
--- a/clusters/hive/pools/ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.7.0-0
     version_upper: 4.8.0-0
   creationTimestamp: null
-  name: ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0
+  name: ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.7.56-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.7.59-x86_64
 status: {}
diff --git a/clusters/hive/pools/ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml
similarity index 60%
rename from clusters/hive/pools/ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml
index e562ea03a6a74..262f92c3c36ab 100644
--- a/clusters/hive/pools/ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.8.0-0
     version_upper: 4.9.0-0
   creationTimestamp: null
-  name: ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0
+  name: ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.8.48-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.8.49-x86_64
 status: {}
diff --git a/clusters/hive/pools/ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml
similarity index 60%
rename from clusters/hive/pools/ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml
rename to clusters/hive/pools/ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml
index 0d396ba9ae042..58818cd56b853 100644
--- a/clusters/hive/pools/ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml
+++ b/clusters/hive/pools/ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.9.0-0
     version_upper: 4.10.0-0
   creationTimestamp: null
-  name: ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0
+  name: ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.9.46-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.9.48-x86_64
 status: {}
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
index 5bbf8b78c97c9..cc8e61c770551 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml
index bb4b6b821dc22..d8169ac7af46e 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-west-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-11-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-11-0-amd64-aws-us-east-1_clusterpool.yaml
index 4f3baade3dcc0..105812f9f72ca 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-11-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-11-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.11.1-x86-64-for-4.11.0-0-to-4.12.0-0
+    name: ocp-release-4.11.4-x86-64-for-4.11.0-0-to-4.12.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
index b860dc501a8a3..b6998ccd3221e 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0
+    name: ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
index 4fd26dad303be..dcbcc1bca3b0f 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0
+    name: ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
index eda172b8b885f..e03b0a3c1dd3e 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0
+    name: ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-9-0-amd64-aws-us-west-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-9-0-amd64-aws-us-west-1_clusterpool.yaml
index a4b7a2cb5b530..3158051ef69d6 100644
--- a/clusters/hive/pools/openshift-ci/ci-ocp-4-9-0-amd64-aws-us-west-1_clusterpool.yaml
+++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-9-0-amd64-aws-us-west-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.9.46-x86-64-for-4.9.0-0-to-4.10.0-0
+    name: ocp-release-4.9.48-x86-64-for-4.9.0-0-to-4.10.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-west-1
diff --git a/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml b/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml
index 4fd35ded69d83..57d7fc3c2f685 100644
--- a/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml
+++ b/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml
@@ -1,6 +1,7 @@
 apiVersion: hive.openshift.io/v1
 kind: ClusterPool
 metadata:
+  creationTimestamp: null
   labels:
     architecture: amd64
     cloud: vexxhost
@@ -13,13 +14,14 @@ metadata:
   namespace: openstack-k8s-operators-cluster-pool
 spec:
   baseDomain: oooci.ccitredhat.com
+  hibernationConfig: null
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-sno
-  inventory:
-    - name: openstack-k8s-operators-cdc-pod-01
+  maxConcurrent: 1
+  maxSize: 1
   platform:
     openstack:
       cloud: openstack
@@ -27,8 +29,10 @@ spec:
         name: openstack-operators-vexxhost-hive-creds
   pullSecretRef:
     name: pull-secret
-  size: 1
-  maxSize: 1
-  maxConcurrent: 1
   runningCount: 1
+  size: 1
   skipMachinePools: true
+status:
+  ready: 0
+  size: 0
+  standby: 0
diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
index 81ac841978ab7..63322a87ac083 100644
--- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.10.28-x86-64-for-4.10.0-0-to-4.11.0-0
+    name: ocp-release-4.10.32-x86-64-for-4.10.0-0-to-4.11.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
index a3cb902ecb587..ade53636fa78d 100644
--- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-6-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.6.60-x86-64-for-4.6.0-0-to-4.7.0-0
+    name: ocp-release-4.6.61-x86-64-for-4.6.0-0-to-4.7.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
index 3340371e76325..03aed4f4a489b 100644
--- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-7-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.7.56-x86-64-for-4.7.0-0-to-4.8.0-0
+    name: ocp-release-4.7.59-x86-64-for-4.7.0-0-to-4.8.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
index 35b575a1f0725..d8b7cc021a6a6 100644
--- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0
+    name: ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml
index 0fa4cf1228e11..a49631a9a7c98 100644
--- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.8.48-x86-64-for-4.8.0-0-to-4.9.0-0
+    name: ocp-release-4.8.49-x86-64-for-4.8.0-0-to-4.9.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_13 b/core-services/image-mirroring/openshift/mapping_origin_4_13
index bb7a6236a99b4..af383791077b2 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_13
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_13
@@ -10,6 +10,7 @@ registry.ci.openshift.org/origin/4.13:ironic-ipa-downloader quay.io/openshift/or
 registry.ci.openshift.org/origin/4.13:ironic-machine-os-downloader quay.io/openshift/origin-ironic-machine-os-downloader:4.13 quay.io/openshift/origin-ironic-machine-os-downloader:4.13.0
 registry.ci.openshift.org/origin/4.13:ironic-static-ip-manager quay.io/openshift/origin-ironic-static-ip-manager:4.13 quay.io/openshift/origin-ironic-static-ip-manager:4.13.0
 registry.ci.openshift.org/origin/4.13:libvirt-installer quay.io/openshift/origin-libvirt-installer:4.13 quay.io/openshift/origin-libvirt-installer:4.13.0
+registry.ci.openshift.org/origin/4.13:machine-config-operator quay.io/openshift/origin-machine-config-operator:4.13 quay.io/openshift/origin-machine-config-operator:4.13.0
 registry.ci.openshift.org/origin/4.13:machine-os-content quay.io/openshift/origin-machine-os-content:4.13 quay.io/openshift/origin-machine-os-content:4.13.0
 registry.ci.openshift.org/origin/4.13:machine-os-images quay.io/openshift/origin-machine-os-images:4.13 quay.io/openshift/origin-machine-os-images:4.13.0
 registry.ci.openshift.org/origin/4.13:okd-rpms quay.io/openshift/origin-okd-rpms:4.13 quay.io/openshift/origin-okd-rpms:4.13.0
diff --git a/core-services/prow/02_config/openshift-priv/cloud-provider-nutanix/_pluginconfig.yaml b/core-services/prow/02_config/openshift-priv/cloud-provider-nutanix/_pluginconfig.yaml
new file mode 100644
index 0000000000000..438d8da9b184b
--- /dev/null
+++ b/core-services/prow/02_config/openshift-priv/cloud-provider-nutanix/_pluginconfig.yaml
@@ -0,0 +1,12 @@
+approve:
+- commandHelpLink: ""
+  repos:
+  - openshift-priv/cloud-provider-nutanix
+  require_self_approval: true
+lgtm:
+- repos:
+  - openshift-priv/cloud-provider-nutanix
+plugins:
+  openshift-priv/cloud-provider-nutanix:
+    plugins:
+    - approve
diff --git a/core-services/prow/02_config/openshift-priv/route-controller-manager/_pluginconfig.yaml b/core-services/prow/02_config/openshift-priv/route-controller-manager/_pluginconfig.yaml
new file mode 100644
index 0000000000000..47456f2fbf0f2
--- /dev/null
+++ b/core-services/prow/02_config/openshift-priv/route-controller-manager/_pluginconfig.yaml
@@ -0,0 +1,4 @@
+plugins:
+  openshift-priv/route-controller-manager:
+    plugins:
+    - approve
diff --git a/core-services/prow/02_config/openshift-priv/windows-machine-config-bootstrapper/_pluginconfig.yaml b/core-services/prow/02_config/openshift-priv/windows-machine-config-bootstrapper/_pluginconfig.yaml
index 96bc16350447e..9ed1fa8ae901b 100644
--- a/core-services/prow/02_config/openshift-priv/windows-machine-config-bootstrapper/_pluginconfig.yaml
+++ b/core-services/prow/02_config/openshift-priv/windows-machine-config-bootstrapper/_pluginconfig.yaml
@@ -14,6 +14,8 @@ bugzilla:
               validate_by_default: false
             community-4.10:
               validate_by_default: false
+            community-4.11:
+              validate_by_default: false
 plugins:
   openshift-priv/windows-machine-config-bootstrapper:
     plugins:
diff --git a/core-services/prow/02_config/openshift-priv/windows-machine-config-operator/_pluginconfig.yaml b/core-services/prow/02_config/openshift-priv/windows-machine-config-operator/_pluginconfig.yaml
index 7f6fe440b35ee..4169f3f7f5d3c 100644
--- a/core-services/prow/02_config/openshift-priv/windows-machine-config-operator/_pluginconfig.yaml
+++ b/core-services/prow/02_config/openshift-priv/windows-machine-config-operator/_pluginconfig.yaml
@@ -19,6 +19,8 @@ bugzilla:
               validate_by_default: false
             community-4.10:
               validate_by_default: false
+            community-4.11:
+              validate_by_default: false
 plugins:
   openshift-priv/windows-machine-config-operator:
     plugins: