diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
index 42aae433dd4b6..3b435a986b7e1 100644
--- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
+++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
@@ -3,10 +3,10 @@ base_images:
     name: centos
     namespace: openshift
     tag: stream9
-  rhel-coreos-9-base:
+  rhel-coreos-base:
     name: "4.18"
     namespace: ocp
-    tag: rhel-coreos-9
+    tag: rhel-coreos
 build_root:
   image_stream_tag:
     name: release
@@ -27,7 +27,7 @@ images:
     # in a container https://github.com/coreos/rpm-ostree/issues/4034
     RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download cri-o
     # See also https://issues.redhat.com/browse/ART-4352
-    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
     COPY --from=build /*.rpm /
     # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
     RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
@@ -35,10 +35,10 @@ images:
     base-machine-with-rpms:
       as:
       - quay.io/centos/centos:stream9
-    rhel-coreos-9-base:
+    rhel-coreos-base:
       as:
-      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
-  to: rhel-coreos-9
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos
+  to: rhel-coreos
 raw_steps:
 - rpm_image_injection_step:
     from: base-machine