diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
index 4fb96cbf4d32d..20a1d175a8414 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -19,10 +19,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  machine-os-content-base:
-    name: "4.16"
-    namespace: ocp
-    tag: machine-os-content
   oc-rpms:
     name: "4.16"
     namespace: ocp
@@ -74,15 +70,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
   to: kubernetes-tests
-- context_dir: openshift-hack/images/os/
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - centos:stream9
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-  to: machine-os-content
 - dockerfile_literal: |
     # This uses the new rhel-coreos base image
     # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -118,7 +105,6 @@ promotion:
   - additional_images:
       artifacts: artifacts
     excluded_images:
-    - machine-os-content
     - rhel-coreos
     name: "4.16"
     namespace: ocp
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml
index 0cc5d062c528a..3c9bd80eb199a 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml
@@ -19,10 +19,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  machine-os-content-base:
-    name: "4.16"
-    namespace: ocp
-    tag: machine-os-content
   oc-rpms:
     name: "4.16"
     namespace: ocp
@@ -74,15 +70,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
   to: kubernetes-tests
-- context_dir: openshift-hack/images/os/
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - centos:stream9
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-  to: machine-os-content
 - dockerfile_literal: |
     # This uses the new rhel-coreos base image
     # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -119,7 +106,6 @@ promotion:
       artifacts: artifacts
     disabled: true
     excluded_images:
-    - machine-os-content
     - rhel-coreos
     name: "4.16"
     namespace: ocp
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml
index d1d906e606331..6b2955998beef 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml
@@ -19,10 +19,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  machine-os-content-base:
-    name: "4.17"
-    namespace: ocp
-    tag: machine-os-content
   oc-rpms:
     name: "4.17"
     namespace: ocp
@@ -74,15 +70,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
   to: kubernetes-tests
-- context_dir: openshift-hack/images/os/
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - centos:stream9
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-  to: machine-os-content
 - dockerfile_literal: |
     # This uses the new rhel-coreos base image
     # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -118,7 +105,6 @@ promotion:
   - additional_images:
       artifacts: artifacts
     excluded_images:
-    - machine-os-content
     - rhel-coreos
     name: "4.17"
     namespace: ocp
diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml
index d2af8b015691d..22941e899ec67 100644
--- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml
+++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml
@@ -24,12 +24,6 @@ images:
       - destination_dir: .
         source_path: /tmp/Dockerfile.generated
   to: fedora-coreos
-- dockerfile_literal: FROM fedora-coreos
-  inputs:
-    fedora-coreos:
-      as:
-      - fedora-coreos
-  to: machine-os-content
 promotion:
   to:
   - excluded_images:
diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml
index 33379cd2350cb..c70e6e6675522 100644
--- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml
+++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml
@@ -24,12 +24,6 @@ images:
       - destination_dir: .
         source_path: /tmp/Dockerfile.generated
   to: fedora-coreos
-- dockerfile_literal: FROM fedora-coreos
-  inputs:
-    fedora-coreos:
-      as:
-      - fedora-coreos
-  to: machine-os-content
 promotion:
   to:
   - disabled: true
diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml
index e39c937898560..d7f60c9cbfc0d 100644
--- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml
+++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml
@@ -24,12 +24,6 @@ images:
       - destination_dir: .
         source_path: /tmp/Dockerfile.generated
   to: fedora-coreos
-- dockerfile_literal: FROM fedora-coreos
-  inputs:
-    fedora-coreos:
-      as:
-      - fedora-coreos
-  to: machine-os-content
 promotion:
   to:
   - excluded_images:
diff --git a/clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml b/clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml
index 47feea6a34bcf..3f36a69e67aa6 100644
--- a/clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml
+++ b/clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml
@@ -135,7 +135,7 @@ spec:
                         that should be overridden with the provided tag
                       properties:
                         name:
-                          description: Name is the name of the image like "machine-os-content"
+                          description: Name is the name of the image like "rhel-coreos"
                           type: string
                         tag:
                           description: Tag is the tag to override the image with like
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_16 b/core-services/image-mirroring/openshift/mapping_origin_4_16
index 07f16ec407095..2cee1e298748f 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_16
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_16
@@ -207,7 +207,6 @@ registry.ci.openshift.org/origin/4.16:local-storage-operator quay.io/openshift/o
 registry.ci.openshift.org/origin/4.16:machine-api-operator quay.io/openshift/origin-machine-api-operator:4.16 quay.io/openshift/origin-machine-api-operator:4.16.0
 registry.ci.openshift.org/origin/4.16:machine-config-operator quay.io/openshift/origin-machine-config-operator:4.16 quay.io/openshift/origin-machine-config-operator:4.16.0
 registry.ci.openshift.org/origin/4.16:machine-image-customization-controller quay.io/openshift/origin-machine-image-customization-controller:4.16 quay.io/openshift/origin-machine-image-customization-controller:4.16.0
-registry.ci.openshift.org/origin/4.16:machine-os-content quay.io/openshift/origin-machine-os-content:4.16 quay.io/openshift/origin-machine-os-content:4.16.0
 registry.ci.openshift.org/origin/4.16:machine-os-images quay.io/openshift/origin-machine-os-images:4.16 quay.io/openshift/origin-machine-os-images:4.16.0
 registry.ci.openshift.org/origin/4.16:manila-csi-driver-operator-test quay.io/openshift/origin-manila-csi-driver-operator-test:4.16 quay.io/openshift/origin-manila-csi-driver-operator-test:4.16.0
 registry.ci.openshift.org/origin/4.16:mdns-publisher quay.io/openshift/origin-mdns-publisher:4.16 quay.io/openshift/origin-mdns-publisher:4.16.0
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_17 b/core-services/image-mirroring/openshift/mapping_origin_4_17
index 59f2d9f9c7f6c..1cb7eda5e3d1a 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_17
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_17
@@ -8,7 +8,6 @@ registry.ci.openshift.org/origin/4.17:ironic quay.io/openshift/origin-ironic:4.1
 registry.ci.openshift.org/origin/4.17:ironic-agent quay.io/openshift/origin-ironic-agent:4.17 quay.io/openshift/origin-ironic-agent:4.17.0 quay.io/openshift/origin-ironic-agent:latest
 registry.ci.openshift.org/origin/4.17:libvirt-installer quay.io/openshift/origin-libvirt-installer:4.17 quay.io/openshift/origin-libvirt-installer:4.17.0 quay.io/openshift/origin-libvirt-installer:latest
 registry.ci.openshift.org/origin/4.17:machine-config-operator quay.io/openshift/origin-machine-config-operator:4.17 quay.io/openshift/origin-machine-config-operator:4.17.0 quay.io/openshift/origin-machine-config-operator:latest
-registry.ci.openshift.org/origin/4.17:machine-os-content quay.io/openshift/origin-machine-os-content:4.17 quay.io/openshift/origin-machine-os-content:4.17.0 quay.io/openshift/origin-machine-os-content:latest
 registry.ci.openshift.org/origin/4.17:machine-os-images quay.io/openshift/origin-machine-os-images:4.17 quay.io/openshift/origin-machine-os-images:4.17.0 quay.io/openshift/origin-machine-os-images:latest
 registry.ci.openshift.org/origin/4.17:okd-rpms quay.io/openshift/origin-okd-rpms:4.17 quay.io/openshift/origin-okd-rpms:4.17.0 quay.io/openshift/origin-okd-rpms:latest
 registry.ci.openshift.org/origin/4.17:openstack-installer quay.io/openshift/origin-openstack-installer:4.17 quay.io/openshift/origin-openstack-installer:4.17.0 quay.io/openshift/origin-openstack-installer:latest
diff --git a/core-services/release-controller/_releases/release-ocp-4.16-ci.json b/core-services/release-controller/_releases/release-ocp-4.16-ci.json
index 8557179168bfb..1fd55649d63a8 100644
--- a/core-services/release-controller/_releases/release-ocp-4.16-ci.json
+++ b/core-services/release-controller/_releases/release-ocp-4.16-ci.json
@@ -23,7 +23,6 @@
           "rhel-coreos-next",
           "rhel-coreos-next-extensions",
           "machine-config-operator",
-          "machine-os-content",
           "contour",
           "contour-operator",
           "external-dns",
@@ -68,7 +67,6 @@
           "rhel-coreos-next",
           "rhel-coreos-next-extensions",
           "machine-config-operator",
-          "machine-os-content",
           "contour",
           "contour-operator",
           "external-dns",