diff --git a/ci-operator/config/openshift/installer/openshift-installer-main.yaml b/ci-operator/config/openshift/installer/openshift-installer-main.yaml
index 8a15875daec84..d589475cf1f30 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-main.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-main.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.22"
     namespace: ocp
     tag: cli
+  ocp_4.22_base-rhel9:
+    name: "4.22"
+    namespace: ocp
+    tag: base-rhel9
   shellcheck:
     name: shellcheck
     namespace: ci
@@ -66,6 +70,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -110,6 +119,12 @@ promotion:
     - src-oc
     name: "4.22"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-22.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-22.repo
+    from: ocp_4.22_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
index 680d4585f0c41..aeedfebd2ac84 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
@@ -35,6 +35,10 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: cli
+  ocp_4.16_base-rhel9:
+    name: "4.16"
+    namespace: ocp
+    tag: base-rhel9
 build_root:
   from_repository: true
 images:
@@ -47,6 +51,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -70,6 +79,12 @@ promotion:
     - src-oc
     name: "4.16"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-16.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-16.repo
+    from: ocp_4.16_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
index 61b40942e5077..ece438a3a592b 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
@@ -35,6 +35,10 @@ base_images:
     name: "4.17"
     namespace: ocp
     tag: cli
+  ocp_4.17_base-rhel9:
+    name: "4.17"
+    namespace: ocp
+    tag: base-rhel9
 build_root:
   from_repository: true
 images:
@@ -47,6 +51,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -70,6 +79,12 @@ promotion:
     - src-oc
     name: "4.17"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-17.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-17.repo
+    from: ocp_4.17_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
index d4648f2b617ee..762ba0d79c489 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.18"
     namespace: ocp
     tag: cli
+  ocp_4.18_base-rhel9:
+    name: "4.18"
+    namespace: ocp
+    tag: base-rhel9
 build_root:
   from_repository: true
 images:
@@ -49,6 +53,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -72,6 +81,12 @@ promotion:
     - src-oc
     name: "4.18"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-18.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-18.repo
+    from: ocp_4.18_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
index 8aae195a81336..c53e5fa169c6c 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.19"
     namespace: ocp
     tag: cli
+  ocp_4.19_base-rhel9:
+    name: "4.19"
+    namespace: ocp
+    tag: base-rhel9
   vsphere-ci-python:
     name: vsphere-python
     namespace: ci
@@ -54,6 +58,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -77,6 +86,12 @@ promotion:
     - src-oc
     name: "4.19"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-19.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-19.repo
+    from: ocp_4.19_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
index 673578e6473d6..34b48ae99873a 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.20"
     namespace: ocp
     tag: cli
+  ocp_4.20_base-rhel9:
+    name: "4.20"
+    namespace: ocp
+    tag: base-rhel9
   splat-ci-virtctl:
     name: splat-virtctl
     namespace: ci
@@ -58,6 +62,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -102,6 +111,12 @@ promotion:
     - src-oc
     name: "4.20"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-20.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-20.repo
+    from: ocp_4.20_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
index 80ca2a49274e2..c43b95038ac38 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.21"
     namespace: ocp
     tag: cli
+  ocp_4.21_base-rhel9:
+    name: "4.21"
+    namespace: ocp
+    tag: base-rhel9
   shellcheck:
     name: shellcheck
     namespace: ci
@@ -66,6 +70,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -110,6 +119,12 @@ promotion:
     - src-oc
     name: "4.21"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-21.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-21.repo
+    from: ocp_4.21_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
index 6a8284487770e..ce92ab20635be 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.22"
     namespace: ocp
     tag: cli
+  ocp_4.22_base-rhel9:
+    name: "4.22"
+    namespace: ocp
+    tag: base-rhel9
   shellcheck:
     name: shellcheck
     namespace: ci
@@ -66,6 +70,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -111,6 +120,12 @@ promotion:
     - src-oc
     name: "4.22"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-22.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-22.repo
+    from: ocp_4.22_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
index 1dd9bf41c7791..499a612b76db8 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "4.23"
     namespace: ocp
     tag: cli
+  ocp_4.23_base-rhel9:
+    name: "4.23"
+    namespace: ocp
+    tag: base-rhel9
   shellcheck:
     name: shellcheck
     namespace: ci
@@ -66,6 +70,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -110,6 +119,12 @@ promotion:
     - src-oc
     name: "4.23"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-4-23.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-23.repo
+    from: ocp_4.23_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
index 12b57357f3a31..15e5fc506bb50 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
@@ -39,6 +39,10 @@ base_images:
     name: "5.0"
     namespace: ocp
     tag: cli
+  ocp_5.0_base-rhel9:
+    name: "5.0"
+    namespace: ocp
+    tag: base-rhel9
   shellcheck:
     name: shellcheck
     namespace: ci
@@ -66,6 +70,11 @@ images:
 - dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
+  from: openstack-base
+  inputs:
+    openstack-base:
+      as:
+      - registry.ci.openshift.org/ocp/4.17:base-rhel9
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
   to: baremetal-installer
@@ -110,6 +119,12 @@ promotion:
     - src-oc
     name: "5.0"
     namespace: ocp
+raw_steps:
+- pipeline_image_cache_step:
+    commands: |
+      curl http://base-openstack-5-0.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-5-0.repo
+    from: ocp_5.0_base-rhel9
+    to: openstack-base
 releases:
   initial:
     integration: