diff --git a/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml b/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml
index fed40dc42b1a6..15959f2971522 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml
@@ -1,39 +1,24 @@
 base_images:
-  ocp_builder_rhel-8-golang-1.20-openshift-4.16:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.20-openshift-4.16
-  ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
   ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
     tag: rhel-9-golang-1.21-openshift-4.16
-  origin_scos-4.16_base-stream8:
+  origin_scos-4.16_base-stream9:
     name: scos-4.16
     namespace: origin
-    tag: base-stream8
+    tag: base-stream9
 build_root:
   image_stream_tag:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 images:
 - build_args:
   - name: TAGS
     value: scos
   dockerfile_path: images/cli/Dockerfile.rhel
-  from: origin_scos-4.16_base-stream8
+  from: origin_scos-4.16_base-stream9
   inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
     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
@@ -50,10 +35,7 @@ images:
   dockerfile_path: images/cli-artifacts/Dockerfile.rhel
   from: cli
   inputs:
-    ocp_builder_rhel-8-golang-1.20-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    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: cli-artifacts