diff --git a/ci-operator/config/openshift-priv/descheduler/openshift-priv-descheduler-release-4.18.yaml b/ci-operator/config/openshift-priv/descheduler/openshift-priv-descheduler-release-4.18.yaml
index 0a1a2d54980d..86b07eb6a4ac 100644
--- a/ci-operator/config/openshift-priv/descheduler/openshift-priv-descheduler-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/descheduler/openshift-priv-descheduler-release-4.18.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-base-openshift-4.17:
+  ocp_builder_rhel-9-base-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-base-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    tag: rhel-9-base-openshift-4.19
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
@@ -14,12 +14,12 @@ canonical_go_repository: sigs.k8s.io/descheduler
 images:
 - dockerfile_path: images/descheduler/Dockerfile.rhel7
   inputs:
-    ocp_builder_rhel-9-base-openshift-4.17:
+    ocp_builder_rhel-9-base-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: descheduler
 promotion:
   to:
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml
index 7a69aec23a17..15975b7aebe4 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml
@@ -647,6 +647,15 @@ tests:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp-latestinstaller
   timeout: 6h0m0s
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  run_if_changed: (baremetal|metal3|ironic)
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
@@ -841,7 +850,7 @@ tests:
     cluster_profile: vsphere-elastic
     workflow: openshift-e2e-vsphere-staticip
   timeout: 6h0m0s
-- as: e2e-vsphere-ovn-multi-network
+- as: e2e-vsphere-ovn-multi-network-techpreview
   optional: true
   steps:
     cluster_profile: vsphere-elastic
@@ -853,6 +862,16 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-e2e-vsphere
+- as: e2e-vsphere-ovn-multi-network
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      MULTI_NIC_IPI: "true"
+    observers:
+      enable:
+      - observers-resource-watch
+    workflow: openshift-e2e-vsphere
 - as: e2e-vsphere-ovn-multi-disk
   optional: true
   run_if_changed: vsphere
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml
index d23a97570e4f..724ca819b49f 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml
@@ -648,6 +648,15 @@ tests:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp-latestinstaller
   timeout: 6h0m0s
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  run_if_changed: (baremetal|metal3|ironic)
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
@@ -842,7 +851,7 @@ tests:
     cluster_profile: vsphere-elastic
     workflow: openshift-e2e-vsphere-staticip
   timeout: 6h0m0s
-- as: e2e-vsphere-ovn-multi-network
+- as: e2e-vsphere-ovn-multi-network-techpreview
   optional: true
   steps:
     cluster_profile: vsphere-elastic
@@ -854,6 +863,16 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-e2e-vsphere
+- as: e2e-vsphere-ovn-multi-network
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      MULTI_NIC_IPI: "true"
+    observers:
+      enable:
+      - observers-resource-watch
+    workflow: openshift-e2e-vsphere
 - as: e2e-vsphere-ovn-multi-disk
   optional: true
   run_if_changed: vsphere
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml
index 258b75443e17..36ea9f65b3b3 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml
@@ -647,6 +647,15 @@ tests:
     cluster_profile: gcp
     workflow: openshift-upgrade-gcp-latestinstaller
   timeout: 6h0m0s
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  run_if_changed: (baremetal|metal3|ironic)
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
@@ -841,7 +850,7 @@ tests:
     cluster_profile: vsphere-elastic
     workflow: openshift-e2e-vsphere-staticip
   timeout: 6h0m0s
-- as: e2e-vsphere-ovn-multi-network
+- as: e2e-vsphere-ovn-multi-network-techpreview
   optional: true
   steps:
     cluster_profile: vsphere-elastic
@@ -853,6 +862,16 @@ tests:
       enable:
       - observers-resource-watch
     workflow: openshift-e2e-vsphere
+- as: e2e-vsphere-ovn-multi-network
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      MULTI_NIC_IPI: "true"
+    observers:
+      enable:
+      - observers-resource-watch
+    workflow: openshift-e2e-vsphere
 - as: e2e-vsphere-ovn-multi-disk
   optional: true
   run_if_changed: vsphere
diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml
index 415fe5529b58..4d11738a20c5 100644
--- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml
+++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml
@@ -103,7 +103,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: e2e-aws-tests-cache
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
@@ -112,7 +113,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: e2e-aws-tests-cache-arm
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.19.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.19.yaml
index 1700ca540601..00428867c081 100644
--- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.19.yaml
@@ -104,7 +104,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: e2e-aws-tests-cache
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
@@ -113,7 +114,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: e2e-aws-tests-cache-arm
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.20.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.20.yaml
index 4e2b8e5f7f16..16fc0c30e361 100644
--- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.20.yaml
@@ -103,7 +103,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: e2e-aws-tests-cache
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
@@ -112,7 +113,8 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: e2e-aws-tests-cache-arm
-  cluster: build11
+  capabilities:
+  - intranet
   restrict_network_access: false
   run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
   steps:
diff --git a/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.17.yaml b/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.17.yaml
index 4e69231a385d..e0222d7a9e59 100644
--- a/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.17.yaml
@@ -1,3 +1,8 @@
+base_images:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.17
 build_root:
   image_stream_tag:
     name: release
@@ -6,6 +11,10 @@ build_root:
 canonical_go_repository: github.com/openshift/monitoring-plugin
 images:
 - dockerfile_path: Dockerfile
+  inputs:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
   to: monitoring-plugin
 - dockerfile_path: Dockerfile.test
   to: monitoring-plugin-test
diff --git a/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.18.yaml b/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.18.yaml
index 51894cc8cf51..d07683d412fc 100644
--- a/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.18.yaml
@@ -3,6 +3,10 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
+  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.18
 build_root:
   image_stream_tag:
     name: release
@@ -11,6 +15,10 @@ build_root:
 canonical_go_repository: github.com/openshift/monitoring-plugin
 images:
 - dockerfile_path: Dockerfile
+  inputs:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: monitoring-plugin
 - dockerfile_path: Dockerfile.test
   to: monitoring-plugin-test
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 fce1558fc6b5..850256353a3d 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
@@ -240,11 +240,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -256,12 +253,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-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 0c88a440bb07..24af64dd492c 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
@@ -208,11 +208,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-winc-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 9b1b5d527779..c17d6f5fa759 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
@@ -221,11 +221,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.14.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.14.yaml
index 750d2c5ee1ea..01d54e20cd20 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.14.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.14.yaml
@@ -227,11 +227,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -243,12 +240,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.15.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.15.yaml
index e8ea23f17fb9..bcaf841ce6b8 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.15.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.15.yaml
@@ -237,11 +237,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -253,12 +250,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.16.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.16.yaml
index b4d20e6df11f..722369b2b299 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.16.yaml
@@ -244,11 +244,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -260,12 +257,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.17.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.17.yaml
index c9a446132a92..8b509a64efe6 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.17.yaml
@@ -235,11 +235,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -251,12 +248,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.18.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.18.yaml
index 65b3234b494e..203acf9da244 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.18.yaml
@@ -240,11 +240,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -256,12 +253,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.19.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.19.yaml
index 198d67910992..832c948aba6e 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.19.yaml
@@ -241,11 +241,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -257,12 +254,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.20.yaml b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.20.yaml
index b131918afdd0..c251c2c79675 100644
--- a/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.20.yaml
@@ -240,11 +240,8 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: cucushift-installer-rehearse-aws-ipi-private
 - as: debug-disasterrecovery-baremetal-upi
   optional: true
@@ -256,12 +253,9 @@ tests:
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       FORCE_SUCCESS_EXIT: "no"
-      TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
-      TEST_SCENARIOS: DR_Testing
-      TEST_TIMEOUT: "50"
       architecture: arm64
     test:
-    - ref: openshift-extended-test
+    - chain: openshift-e2e-test-qe-disasterrecovery-sanity
     workflow: baremetal-lab-upi
 - as: debug-winc-aws-ipi
   optional: true
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml
index 3bf9719cd46d..5ea5427e4350 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml
@@ -383,6 +383,14 @@ tests:
     test:
     - ref: openshift-e2e-test
     workflow: ipi-aws
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml
index 15811ee9fbfe..fe3489737608 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml
@@ -384,6 +384,14 @@ tests:
     test:
     - ref: openshift-e2e-test
     workflow: ipi-aws
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml
index a2c1fbca334c..4560b7d378f7 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml
@@ -383,6 +383,14 @@ tests:
     test:
     - ref: openshift-e2e-test
     workflow: ipi-aws
+- always_run: false
+  as: e2e-metal-ovn-two-node-arbiter
+  cluster: build05
+  optional: true
+  steps:
+    cluster_profile: equinix-ocp-metal
+    workflow: baremetalds-arbiter
+  timeout: 5h0m0s
 - as: e2e-metal-ipi-ovn
   cluster: build05
   optional: true
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 eb35ba9bec0a..9af1bb857dc3 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
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -36,26 +32,23 @@ canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml
index 9b0a7ea43ea2..53bbf22361b8 100644
--- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -36,26 +32,23 @@ canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml
index 7fcbe2e81077..1de4a874e6b4 100644
--- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -36,26 +32,23 @@ canonical_go_repository: github.com/openshift/ovn-kubernetes
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
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 8f0b114fad10..894c8e0d42eb 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
@@ -923,6 +923,7 @@ tests:
   node_architecture: arm64
   optional: true
   steps:
+    node_architecture: arm64
     test:
     - as: breaking-changes
       commands: |
diff --git a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.18.yaml b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.18.yaml
index 5a42daa248a1..2b3ce870e5e9 100644
--- a/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.18.yaml
+++ b/ci-operator/config/openshift/descheduler/openshift-descheduler-release-4.18.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-base-openshift-4.17:
+  ocp_builder_rhel-9-base-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-base-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    tag: rhel-9-base-openshift-4.19
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
@@ -14,12 +14,12 @@ canonical_go_repository: sigs.k8s.io/descheduler
 images:
 - dockerfile_path: images/descheduler/Dockerfile.rhel7
   inputs:
-    ocp_builder_rhel-9-base-openshift-4.17:
+    ocp_builder_rhel-9-base-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: descheduler
 promotion:
   to:
diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17.yaml
index d96d44844db4..cbd7b6af7d38 100644
--- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17.yaml
+++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17.yaml
@@ -1,3 +1,8 @@
+base_images:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.17
 build_root:
   image_stream_tag:
     name: release
@@ -5,6 +10,10 @@ build_root:
     tag: golang-1.13
 images:
 - dockerfile_path: Dockerfile
+  inputs:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
   to: monitoring-plugin
 - dockerfile_path: Dockerfile.test
   to: monitoring-plugin-test
diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17__okd-scos.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17__okd-scos.yaml
index 0dfd819a1a6b..3421e296ced1 100644
--- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17__okd-scos.yaml
+++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.17__okd-scos.yaml
@@ -29,7 +29,7 @@ images:
       - registry.redhat.io/ubi9/nodejs-18:1-118
     ocp_builder_rhel-9-golang-1.22-openshift-4.17:
       as:
-      - quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
   to: monitoring-plugin
 promotion:
   to:
diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18.yaml
index b7737cce52a1..3c9eba140669 100644
--- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18.yaml
+++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18.yaml
@@ -3,6 +3,10 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
+  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.18
 build_root:
   image_stream_tag:
     name: release
@@ -10,6 +14,10 @@ build_root:
     tag: golang-1.13
 images:
 - dockerfile_path: Dockerfile
+  inputs:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: monitoring-plugin
 - dockerfile_path: Dockerfile.test
   to: monitoring-plugin-test
diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18__okd-scos.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18__okd-scos.yaml
index ddb2f4223538..4f4bf106a2be 100644
--- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18__okd-scos.yaml
+++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-release-4.18__okd-scos.yaml
@@ -29,7 +29,7 @@ images:
       - registry.redhat.io/ubi9/nodejs-18:1-118
     ocp_builder_rhel-9-golang-1.22-openshift-4.18:
       as:
-      - quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: monitoring-plugin
 promotion:
   to:
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 a9175428a44e..92e9630a916e 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
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -35,26 +31,23 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.19-upgrade-from-stable-4.18.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.19-upgrade-from-stable-4.18.yaml
index c94b2b267ac8..7b76f585a1f2 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.19-upgrade-from-stable-4.18.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.19-upgrade-from-stable-4.18.yaml
@@ -1,16 +1,12 @@
 base_images:
-  ocp_4.17_base-rhel9:
-    name: "4.17"
+  ocp_4.19_base-rhel9:
+    name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -20,19 +16,16 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd-scos.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd-scos.yaml
index ad2d8e57f46a..778bb7b7193b 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd-scos.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__okd-scos.yaml
@@ -31,12 +31,12 @@ images:
   inputs:
     ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
       - rhel8
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - builder
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - build_args:
   - name: TAGS
@@ -47,7 +47,6 @@ images:
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - builder
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes-microshift
 promotion:
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml
index f899f5b2b750..7b8e6d7b6703 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -35,26 +31,23 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml
index 9ec77612e8c0..5a70cb7a12c5 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml
@@ -7,18 +7,14 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  ocp_4.17_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+  ocp_builder_rhel-8-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.22-openshift-4.17
-  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
+    tag: rhel-8-golang-1.23-openshift-4.19
   ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
@@ -35,26 +31,23 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.base
   inputs:
-    ocp_4.17_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.17:base-rhel9
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
   to: ovn-kubernetes-base
 - dockerfile_path: Dockerfile
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
+    ocp_builder_rhel-8-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: ovn-kubernetes
 - dockerfile_path: Dockerfile.microshift
   from: ovn-kubernetes-base
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
diff --git a/ci-operator/config/stolostron/cluster-image-set-controller/stolostron-cluster-image-set-controller-backplane-2.9.yaml b/ci-operator/config/stolostron/cluster-image-set-controller/stolostron-cluster-image-set-controller-backplane-2.9.yaml
index de873d2a07ec..b1f18c657b03 100644
--- a/ci-operator/config/stolostron/cluster-image-set-controller/stolostron-cluster-image-set-controller-backplane-2.9.yaml
+++ b/ci-operator/config/stolostron/cluster-image-set-controller/stolostron-cluster-image-set-controller-backplane-2.9.yaml
@@ -3,6 +3,10 @@ base_images:
     name: builder
     namespace: stolostron
     tag: go1.22-linux
+  stolostron_builder_go1.23-linux:
+    name: builder
+    namespace: stolostron
+    tag: go1.23-linux
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +15,9 @@ build_root:
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    stolostron_builder_go1.22-linux:
+    stolostron_builder_go1.23-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
   to: cluster-image-set-controller
 promotion:
   to:
diff --git a/ci-operator/config/stolostron/cluster-permission/stolostron-cluster-permission-release-2.14.yaml b/ci-operator/config/stolostron/cluster-permission/stolostron-cluster-permission-release-2.14.yaml
index 30e3633bbff3..50982b98c5c6 100644
--- a/ci-operator/config/stolostron/cluster-permission/stolostron-cluster-permission-release-2.14.yaml
+++ b/ci-operator/config/stolostron/cluster-permission/stolostron-cluster-permission-release-2.14.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
-  stolostron_builder_go1.21-linux:
+  stolostron_builder_go1.23-linux:
     name: builder
     namespace: stolostron
-    tag: go1.21-linux
+    tag: go1.23-linux
 build_root:
   image_stream_tag:
     name: builder
@@ -16,9 +16,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.23-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
   to: cluster-permission
 promotion:
   to:
diff --git a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.5.yaml b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.5.yaml
index 30966a8f5dca..8a723cc6a824 100644
--- a/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.5.yaml
+++ b/ci-operator/config/stolostron/managedcluster-import-controller/stolostron-managedcluster-import-controller-backplane-2.5.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: stolostron
     tag: go1.22-linux
+  stolostron_builder_go1.23-linux:
+    name: builder
+    namespace: stolostron
+    tag: go1.23-linux
 binary_build_commands: go build ./cmd/manager
 build_root:
   image_stream_tag:
@@ -17,9 +21,9 @@ images:
 - dockerfile_path: build/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.22-linux:
+    stolostron_builder_go1.23-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
   to: managedcluster-import-controller
 promotion:
   to:
diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.5.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.5.yaml
index c4c7f4ea8768..db623f1e1ead 100644
--- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.5.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.5.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
-  stolostron_builder_go1.23-linux:
+  stolostron_builder_go1.21-linux:
     name: builder
     namespace: stolostron
-    tag: go1.23-linux
+    tag: go1.21-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
@@ -17,9 +17,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.23-linux:
+    stolostron_builder_go1.21-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
   to: multicloud-manager
 promotion:
   to:
diff --git a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml
index 4690ed019f3b..a66f29f5040d 100644
--- a/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml
+++ b/ci-operator/config/stolostron/multicloud-operators-foundation/stolostron-multicloud-operators-foundation-backplane-2.6.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
-  stolostron_builder_go1.23-linux:
+  stolostron_builder_go1.21-linux:
     name: builder
     namespace: stolostron
-    tag: go1.23-linux
+    tag: go1.21-linux
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   image_stream_tag:
@@ -17,9 +17,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.23-linux:
+    stolostron_builder_go1.21-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
   to: multicloud-manager
 promotion:
   to:
diff --git a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.9.yaml b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.9.yaml
index b598a2940dc2..10a546632e96 100644
--- a/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.9.yaml
+++ b/ci-operator/config/stolostron/provider-credential-controller/stolostron-provider-credential-controller-backplane-2.9.yaml
@@ -3,6 +3,10 @@ base_images:
     name: builder
     namespace: stolostron
     tag: go1.22-linux
+  stolostron_builder_go1.23-linux:
+    name: builder
+    namespace: stolostron
+    tag: go1.23-linux
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +15,9 @@ build_root:
 images:
 - dockerfile_path: Dockerfile.prow
   inputs:
-    stolostron_builder_go1.22-linux:
+    stolostron_builder_go1.23-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.23-linux
   to: provider-credential-controller
 promotion:
   to:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml
index d233a80b6713..02b2553dd9a9 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml
@@ -8038,6 +8038,92 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-virtualmedia,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-main-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    run_if_changed: (baremetal|metal3|ironic)
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -9556,6 +9642,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: vsphere02
+    context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
+    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-elastic
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-main-e2e-vsphere-ovn-multi-network-techpreview
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
+    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=e2e-vsphere-ovn-multi-network-techpreview
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml
index 1cfc76f5ce1d..77a7d1e8b780 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml
@@ -8046,6 +8046,92 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-virtualmedia,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.19$
+    - ^release-4\.19-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.19-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    run_if_changed: (baremetal|metal3|ironic)
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -9564,6 +9650,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.19$
+    - ^release-4\.19-
+    cluster: vsphere02
+    context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
+    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-elastic
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.19-e2e-vsphere-ovn-multi-network-techpreview
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
+    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=e2e-vsphere-ovn-multi-network-techpreview
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml
index 8ce535d5d871..979f42425a38 100644
--- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml
@@ -8046,6 +8046,92 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-virtualmedia,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.20$
+    - ^release-4\.20-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.20-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    run_if_changed: (baremetal|metal3|ironic)
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -9564,6 +9650,89 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.20$
+    - ^release-4\.20-
+    cluster: vsphere02
+    context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
+    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-elastic
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-installer-release-4.20-e2e-vsphere-ovn-multi-network-techpreview
+    optional: true
+    path_alias: github.com/openshift/installer
+    rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
+    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=e2e-vsphere-ovn-multi-network-techpreview
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-main-presubmits.yaml
index 3a19036aaea2..9b3deba446e5 100644
--- a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-main-presubmits.yaml
@@ -685,16 +685,16 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.19"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -771,16 +771,16 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache-arm
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.19"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.19-presubmits.yaml
index 644115e3a3de..ff6bce1877a3 100644
--- a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.19-presubmits.yaml
@@ -685,16 +685,16 @@ presubmits:
     branches:
     - ^release-4\.19$
     - ^release-4\.19-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.19"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -771,16 +771,16 @@ presubmits:
     branches:
     - ^release-4\.19$
     - ^release-4\.19-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache-arm
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.19"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.20-presubmits.yaml
index be1b2559feea..9e108bffcdf4 100644
--- a/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/microshift/openshift-priv-microshift-release-4.20-presubmits.yaml
@@ -685,16 +685,16 @@ presubmits:
     branches:
     - ^release-4\.20$
     - ^release-4\.20-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.20"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -771,16 +771,16 @@ presubmits:
     branches:
     - ^release-4\.20$
     - ^release-4\.20-
-    cluster: build11
+    cluster: build07
     context: ci/prow/e2e-aws-tests-cache-arm
     decorate: true
     decoration_config:
       skip_cloning: true
     hidden: true
     labels:
+      capability/intranet: intranet
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
-      ci-operator.openshift.io/cluster: build11
       ci.openshift.io/generator: prowgen
       job-release: "4.20"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml
index 674f74a1302d..336e4a66cc64 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml
@@ -4929,6 +4929,91 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ovn-single-node-with-worker-live-iso,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-origin-main-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/origin
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.19-presubmits.yaml
index 3e908af2d12b..0450236d8229 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.19-presubmits.yaml
@@ -4929,6 +4929,91 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ovn-single-node-with-worker-live-iso,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.19$
+    - ^release-4\.19-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-origin-release-4.19-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/origin
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.20-presubmits.yaml
index 85ba7ed6b1db..27e4f7107a97 100644
--- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.20-presubmits.yaml
@@ -4929,6 +4929,91 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ovn-single-node-with-worker-live-iso,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.20$
+    - ^release-4\.20-
+    cluster: build05
+    context: ci/prow/e2e-metal-ovn-two-node-arbiter
+    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-operator.openshift.io/cluster: build05
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-origin-release-4.20-e2e-metal-ovn-two-node-arbiter
+    optional: true
+    path_alias: github.com/openshift/origin
+    rerun_command: /test e2e-metal-ovn-two-node-arbiter
+    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=e2e-metal-ovn-two-node-arbiter
+        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: /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/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-ovn-two-node-arbiter,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
index 843e021ec13b..83ea42e9045a 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-eu-west-3
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
index 6190c2b04d2f..395433cd8991 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
index b488da87362b..9767b3cfdc9f 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
index 9cee68e1f3d1..e001e3c8aaa4 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-12-amd64-aws-eu-west-3_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-eu-west-3
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
index 4ad0457c5ff2..a764b372ef4c 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
index 66f4f4929453..b7497ac0381b 100644
--- a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/gitops/gitops-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/gitops/gitops-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
index 7b0a512f8b7c..028e87414037 100644
--- a/clusters/hosted-mgmt/hive/pools/gitops/gitops-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/gitops/gitops-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: gitops-install-config
diff --git a/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-medium-single-az-aws_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-medium-single-az-aws_clusterpool.yaml
index 303f936841ce..1cea3b35f365 100644
--- a/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-medium-single-az-aws_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-medium-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-medium-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-small-single-az-aws_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-small-single-az-aws_clusterpool.yaml
index 36092eba00b2..a4c23f5cb6f2 100644
--- a/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-small-single-az-aws_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/msp/msp-ocp-4-12-small-single-az-aws_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-small-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml
similarity index 77%
rename from clusters/hosted-mgmt/hive/pools/ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml
rename to clusters/hosted-mgmt/hive/pools/ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml
index 2a34250d7c04..1b58e17af73b 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0_clusterimageset.yaml
@@ -5,7 +5,7 @@ metadata:
     version_lower: 4.12.0-0
     version_upper: 4.13.0-0
   creationTimestamp: null
-  name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+  name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.12.74-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.12.75-x86_64
 status: {}
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
similarity index 79%
rename from clusters/hosted-mgmt/hive/pools/ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
rename to clusters/hosted-mgmt/hive/pools/ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
index cea8adfef82f..5702f3dd82ca 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
@@ -6,7 +6,7 @@ metadata:
     version_stream: 4-stable
     version_upper: 4.18.0-0
   creationTimestamp: null
-  name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+  name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.17.23-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.17.24-x86_64
 status: {}
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
similarity index 55%
rename from clusters/hosted-mgmt/hive/pools/ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
rename to clusters/hosted-mgmt/hive/pools/ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
index 48d6e403c854..e1f23fdfecd7 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
@@ -3,10 +3,9 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.18.0-0
-    version_stream: 4-stable
     version_upper: 4.19.0-0
   creationTimestamp: null
-  name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+  name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.18.7-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.18.8-x86_64
 status: {}
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
index 1fafe3797a7d..d2a3e850af89 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
index 9119aaa0f8af..f8df80c0c557 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-ci/ci-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-coo-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-coo-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
index 10852b0282fb..9916e669a2d7 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-coo-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-coo-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
index 888e4d00dcd2..533922b0334d 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
index 83a1dda4664d..31ce1a3fdd25 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-2xlarge-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
index 918ac6bcc538..3e1730ac7be4 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-logging-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-2xlarge-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-netobserv-ocp-4-18-amd64-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-netobserv-ocp-4-18-amd64-us-east-1_clusterpool.yaml
index e72b9b03d712..a76c22570d1a 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-netobserv-ocp-4-18-amd64-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-netobserv-ocp-4-18-amd64-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
index 3bbd8727abd4..616cbd5aaac9 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-18-amd64-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-18-amd64-us-east-1_clusterpool.yaml
index 951acd849d38..78cab767b994 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-18-amd64-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-powermon-ocp-4-18-amd64-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
index 5941562c1b65..cc5b31874403 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 30m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
index c1a1bf22acc9..c5a1b9e9c82e 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obs-tracing-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 30m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
index 0d3ef9a3cfc9..02387a064039 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-12-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
index fce12ced2828..f73cf5ec4583 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/obsint-dvo-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
index 3e3bc782ce41..7e8a59a11cc3 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-17-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
index 485e840854b1..1fd90887cf14 100644
--- a/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openshift-observability/ols-ocp-4-18-0-amd64-aws-us-east-1_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-12-vexxhost-hybrid_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-12-vexxhost-hybrid_clusterpool.yaml
index 495aea28fc8f..a8dba7f874fa 100644
--- a/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-12-vexxhost-hybrid_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-12-vexxhost-hybrid_clusterpool.yaml
@@ -16,7 +16,7 @@ spec:
   baseDomain: oooci.ccitredhat.com
   hibernationConfig: null
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 3
   installConfigSecretTemplateRef:
     name: install-config-hybrid-3cp
diff --git a/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-18-vexxhost-hybrid_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-18-vexxhost-hybrid_clusterpool.yaml
index c1b9c38cbd22..6c1484ad2963 100644
--- a/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-18-vexxhost-hybrid_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-18-vexxhost-hybrid_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   baseDomain: oooci.ccitredhat.com
   hibernationConfig: null
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 3
   installConfigSecretTemplateRef:
     name: install-config-hybrid-3cp
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-12-amd64-aws-us-west-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-12-amd64-aws-us-west-2_clusterpool.yaml
index 5d3c1127db84..94ba0c697e6e 100644
--- a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-12-amd64-aws-us-west-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-12-amd64-aws-us-west-2_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-4-12-amd64-aws-us-west-2
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-1_clusterpool.yaml
index e1390445cfce..92ade32a0983 100644
--- a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-1_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-4-17-amd64-aws-us-west-1
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-2_clusterpool.yaml
index 08b22f7064cd..621ee8c4114f 100644
--- a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-17-amd64-aws-us-west-2_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-4-17-amd64-aws-us-west-2
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
index c89faa38a9a1..2ff77edbf449 100644
--- a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-1_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-4-18-amd64-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
index 37c3d4bacbfe..a131e3cc93c9 100644
--- a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-4-18-amd64-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/rhdh/rhdh-ocp-4-17-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rhdh/rhdh-ocp-4-17-0-amd64-aws-us-east-2_clusterpool.yaml
index f38e31cb7756..aff5b9149d24 100644
--- a/clusters/hosted-mgmt/hive/pools/rhdh/rhdh-ocp-4-17-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rhdh/rhdh-ocp-4-17-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 30m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: rhdh-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
index 36b66db68e51..51877f27a39d 100644
--- a/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-east-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: rhtap-aws-us-east-2
diff --git a/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-west-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-west-2_clusterpool.yaml
index d3b04c5780ba..9846c8e7055c 100644
--- a/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-west-2_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/rhtap/rhtap-ocp-4-12-0-amd64-aws-us-west-2_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: rhtap-aws-us-west-2
diff --git a/clusters/hosted-mgmt/hive/pools/serverless/serverless-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/serverless/serverless-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
index f8d90917878d..c4e408d43dde 100644
--- a/clusters/hosted-mgmt/hive/pools/serverless/serverless-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/serverless/serverless-ocp-4-17-amd64-aws-us-east-1_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 20m0s
   imageSetRef:
-    name: ocp-release-4.17.23-x86-64-for-4.17.0-0-to-4.18.0-0
+    name: ocp-release-4.17.24-x86-64-for-4.17.0-0-to-4.18.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-1
diff --git a/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.12_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.12_clusterpool.yaml
index 257ddabc4620..e1e22422f641 100644
--- a/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.12_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.12_clusterpool.yaml
@@ -17,7 +17,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.12.74-x86-64-for-4.12.0-0-to-4.13.0-0
+    name: ocp-release-4.12.75-x86-64-for-4.12.0-0-to-4.13.0-0
   installConfigSecretTemplateRef:
     name: stackrox-ocp-4-13-install-config
   labels:
diff --git a/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.18_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.18_clusterpool.yaml
index f9d4e5a90ee1..9292ac19e673 100644
--- a/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.18_clusterpool.yaml
+++ b/clusters/hosted-mgmt/hive/pools/stackrox/ocp-4.18_clusterpool.yaml
@@ -18,7 +18,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.18.7-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.8-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 3
   installConfigSecretTemplateRef:
     name: stackrox-ocp-4-13-install-config