diff --git a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
index af1ead7258a8..5789ca3a0ee1 100644
--- a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
@@ -98,17 +98,17 @@ images:
       paths:
       - destination_dir: magic
         source_path: /tmp/cosa
-  to: machine-os-oci-content
+  to: rhel-coreos-8
 - dockerfile_path: extensions/Dockerfile
   inputs:
-    machine-os-oci-content:
+    rhel-coreos-8:
       as:
       - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest
-  to: rhcos-extensions
+  to: rhel-coreos-8-extensions
 promotion:
   additional_images:
-    rhel-coreos: machine-os-oci-content
-    rhel-coreos-extensions: rhcos-extensions
+    rhel-coreos-8: rhel-coreos-8
+    rhel-coreos-8-extensions: rhel-coreos-8-extensions
   excluded_images:
   - oci-archive
   - build-image
@@ -134,15 +134,15 @@ tests:
   cron: '@daily'
   steps:
     test:
-    - as: validate-rhcos-base-image
+    - as: validate-base-image
       commands: cat /etc/os-release
-      from: machine-os-oci-content
+      from: rhel-coreos-8
       resources:
         requests:
           cpu: 100m
-    - as: validate-rhcos-extensions-image
+    - as: validate-extensions-image
       commands: cat /etc/os-release
-      from: rhcos-extensions
+      from: rhel-coreos-8-extensions
       resources:
         requests:
           cpu: 100m
diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
index db086f22807e..e7b56912e278 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
@@ -77,8 +77,8 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=machine-os-oci-content
-        - --target=rhcos-extensions
+        - --target=rhel-coreos-8
+        - --target=rhel-coreos-8-extensions
         - --variant=periodic
         command:
         - ci-operator
diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
index 3f63218c0135..6f63a21b3ded 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
@@ -74,8 +74,8 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=machine-os-oci-content
-        - --target=rhcos-extensions
+        - --target=rhel-coreos-8
+        - --target=rhel-coreos-8-extensions
         - --variant=periodic
         command:
         - ci-operator