diff --git a/image-rhel-8.6.yaml b/image-rhel-8.6.yaml
index 6a6765bf0..0966b5875 100644
--- a/image-rhel-8.6.yaml
+++ b/image-rhel-8.6.yaml
@@ -8,9 +8,8 @@ squashfs-compression: gzip
 # defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
 ignition-network-kcmdline: []
 
-# See https://github.com/coreos/coreos-assembler/pull/3014 - this
-# will hopefully be the default soon, but trying to enable it here first.
-ostree-format: "oci-chunked-v1"
+# Keep OCP metadata on our container image, but xref https://github.com/openshift/os/issues/1047
+ostree-container-inject-openshift-cvo-labels: true
 
 # vmware-secure-boot changes the EFI secure boot option.
 # set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055
diff --git a/image-rhel-9.0.yaml b/image-rhel-9.0.yaml
index 17c8d9cc8..7d7b61d1f 100644
--- a/image-rhel-9.0.yaml
+++ b/image-rhel-9.0.yaml
@@ -5,6 +5,9 @@ size: 16
 # defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
 ignition-network-kcmdline: []
 
+# Keep OCP metadata on our container image, but xref https://github.com/openshift/os/issues/1047
+ostree-container-inject-openshift-cvo-labels: true
+
 # vmware-secure-boot changes the EFI secure boot option.
 # set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055
 vmware-secure-boot: false