diff --git a/Containerfile.base b/Containerfile.base
index 55af79f..ef4ac22 100644
--- a/Containerfile.base
+++ b/Containerfile.base
@@ -26,13 +26,23 @@ for x in etc/dnf etc/yum.repos.d etc/pki/rpm-gpg; do
 done
 # And copy to the workdir; TODO fix this in rpm-ostree
 cp /etc/yum.repos.d/*.repo base
-rpm-ostree compose image --image-config fedora-bootc-config.json \
+rpm-ostree compose image \
     --cachedir=/workdir --format=ociarchive --initialize base/manifest.yaml \
     --source-root=/repos /buildcontext/out.ociarchive
 EORUN
 
 # This pulls in the OCI archive generated in the previous step.
 FROM oci-archive:./out.ociarchive
+LABEL containers.bootc 1
+# This is an ad-hoc way for us to reference bootc-image-builder in
+# a way that in theory client tooling can inspect and find. Today
+# it isn't widely used.
+LABEL bootc.diskimage-builder quay.io/centos-bootc/bootc-image-builder
+# https://pagure.io/fedora-kiwi-descriptions/pull-request/52
+ENV container=oci
+# Make systemd the default
+STOPSIGNAL SIGRTMIN+3
+CMD ["/sbin/init"]
 # Need to reference builder here to force ordering. But since we have to run
 # something anyway, we might as well cleanup after ourselves.
 RUN --mount=type=bind,from=builder,src=.,target=/var/tmp \
diff --git a/fedora-bootc-config.json b/fedora-bootc-config.json
deleted file mode 100644
index 3a53fe1..0000000
--- a/fedora-bootc-config.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "Labels": {
-        "containers.bootc": "1",
-        "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
-        "redhat.id": "fedora",
-        "redhat.version-id": "rawhide"
-    },
-    "StopSignal": "SIGRTMIN+3",
-    "Env": [
-        "container=oci"
-    ]
-}