diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
index eed48b7dbcc42..2b8590fb49ad0 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
@@ -15,6 +15,10 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: base
+  ocp_4.16_base-rhel9:
+    name: "4.16"
+    namespace: ocp
+    tag: base-rhel9
   ocp_builder_rhel-8-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
@@ -40,8 +44,14 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
   to: cli
-- context_dir: images/tools
-  from: cli
+- dockerfile_path: images/tools/Dockerfile
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: tools
 - dockerfile_path: images/cli/Dockerfile.rhel
   from: tests-base