diff --git a/clusters/app.ci/release-controller/deploy-ocp-controller.yaml b/clusters/app.ci/release-controller/deploy-ocp-controller.yaml
index 26fb27a36f5a..5bb6dc656777 100644
--- a/clusters/app.ci/release-controller/deploy-ocp-controller.yaml
+++ b/clusters/app.ci/release-controller/deploy-ocp-controller.yaml
@@ -176,7 +176,7 @@ spec:
         - /usr/bin/release-controller
         - --release-namespace=ocp
         - --publish-namespace=origin
-        - --cluster-group=build01,build02,build03,build05
+        - --cluster-group=build01,build03,build05,build09
         - --cluster-group=vsphere
         - --prow-config=/etc/config/config.yaml
         - --supplemental-prow-config-dir=/etc/config
diff --git a/clusters/app.ci/release-controller/deploy-ocp-priv-controller.yaml b/clusters/app.ci/release-controller/deploy-ocp-priv-controller.yaml
index 0c5946ff5bef..2b8ec7dd7520 100644
--- a/clusters/app.ci/release-controller/deploy-ocp-priv-controller.yaml
+++ b/clusters/app.ci/release-controller/deploy-ocp-priv-controller.yaml
@@ -206,7 +206,7 @@ spec:
       - command:
         - /usr/bin/release-controller
         - --release-namespace=ocp-priv
-        - --cluster-group=build01,build02,build03,build05
+        - --cluster-group=build01,build03,build05,build09
         - --cluster-group=vsphere
         - --prow-config=/etc/config/config.yaml
         - --supplemental-prow-config-dir=/etc/config
diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml
index e6bdbe0bf72e..661a573c8861 100644
--- a/core-services/prow/02_config/_config.yaml
+++ b/core-services/prow/02_config/_config.yaml
@@ -371,7 +371,9 @@ push_gateway:
   serve_metrics: false
 scheduler:
   enabled: true
-  failover: {}
+  failover:
+    mappings:
+      build02: build09
 sinker:
   max_pod_age: 6h0m0s
   max_prowjob_age: 24h0m0s
diff --git a/hack/generators/release-controllers/content/osd_rc_deployments.py b/hack/generators/release-controllers/content/osd_rc_deployments.py
index 22bdfad69a77..efc866317a11 100644
--- a/hack/generators/release-controllers/content/osd_rc_deployments.py
+++ b/hack/generators/release-controllers/content/osd_rc_deployments.py
@@ -275,7 +275,7 @@ def _add_osd_rc_deployment(gendoc):
 
     # Creating Cluster Groups for the AMD64 jobs...
     if context.arch == 'x86_64':
-        extra_rc_args.append('--cluster-group=build01,build02,build03,build05')
+        extra_rc_args.append('--cluster-group=build01,build03,build05,build09')
         extra_rc_args.append('--cluster-group=vsphere')
 
     gendoc.append({