diff --git a/centos-stream-9.yaml b/centos-stream-9.yaml
index c691de1..751dbe5 100644
--- a/centos-stream-9.yaml
+++ b/centos-stream-9.yaml
@@ -1,4 +1,6 @@
 releasever: stream9
+variables:
+  distro: "stream9"
 
 repos:
   - baseos
diff --git a/fedora-tier-0-38.yaml b/fedora-tier-0-38.yaml
index 3fc20aa..baf63db 100644
--- a/fedora-tier-0-38.yaml
+++ b/fedora-tier-0-38.yaml
@@ -1,4 +1,6 @@
 releasever: 38
+variables:
+  distro: "f38"
 
 repos:
   - fedora
diff --git a/fedora-tier-0-dev-eln.yaml b/fedora-tier-0-dev-eln.yaml
index 584a2cd..2de0d33 100644
--- a/fedora-tier-0-dev-eln.yaml
+++ b/fedora-tier-0-dev-eln.yaml
@@ -1,3 +1,3 @@
 include:
-  - fedora-tier-0-38.yaml
+  - fedora-tier-0-eln.yaml
   - fedora-dev.yaml
diff --git a/fedora-tier-0-eln.yaml b/fedora-tier-0-eln.yaml
index 6be213d..e51d49d 100644
--- a/fedora-tier-0-eln.yaml
+++ b/fedora-tier-0-eln.yaml
@@ -1,4 +1,6 @@
 releasever: 39
+variables:
+  distro: "eln"
 
 repos:
   - eln-baseos
diff --git a/fedora-tier-1-38.yaml b/fedora-tier-1-38.yaml
index 3548d80..f977d2b 100644
--- a/fedora-tier-1-38.yaml
+++ b/fedora-tier-1-38.yaml
@@ -1,4 +1,6 @@
 releasever: 38
+variables:
+  distro: "f38"
 
 repos:
   - fedora
diff --git a/fedora-tier-1-eln.yaml b/fedora-tier-1-eln.yaml
index dce0d59..c3a89fa 100644
--- a/fedora-tier-1-eln.yaml
+++ b/fedora-tier-1-eln.yaml
@@ -1,4 +1,6 @@
 releasever: 39
+variables:
+  distro: "eln"
 
 repos:
   - eln-baseos
diff --git a/tier-0/bootc.yaml b/tier-0/bootc.yaml
index a964aa9..10c09f4 100644
--- a/tier-0/bootc.yaml
+++ b/tier-0/bootc.yaml
@@ -1,11 +1,7 @@
-include:
-  - ostree.yaml
-
 # The bootc components.
 packages:
  - systemd
- # For now this will be shipped in rpm-ostree; TODO fix this by shipping a separate epackage
- # - bootc
+ - bootc
  # Required by bootc install today, though we'll likely switch bootc to use a Rust crate instead of sgdisk
  - gdisk xfsprogs e2fsprogs dosfstools
 
@@ -16,12 +12,6 @@ exclude-packages:
   - kernel-debug-core
 
 postprocess:
-  # rpm-ostree can be an alias for bootc, we want to enable that here.
-  - |
-    #!/usr/bin/env bash
-    if test ! -x /usr/bin/bootc && test -x /usr/bin/rpm-ostree; then
-      ln -sr /usr/bin/{rpm-ostree,bootc}
-    fi
   # XFS is our default filesystem
   - |
     #!/usr/bin/env bash
diff --git a/tier-0/manifest.yaml b/tier-0/manifest.yaml
index fc9e0e0..6e79d13 100644
--- a/tier-0/manifest.yaml
+++ b/tier-0/manifest.yaml
@@ -49,8 +49,12 @@ remove-from-packages:
   # https://bugzilla.redhat.com/show_bug.cgi?id=2105177
   - [dbus-common, /usr/lib/sysusers.d/dbus.conf]
 
+conditional-include:
+  - if: distro != "stream9"
+    include: bootc.yaml
+
 include:
-  - bootc.yaml
+  - ostree.yaml
   - initramfs.yaml
 
 packages: