diff --git a/tier-0/bootc.yaml b/tier-0/bootc.yaml
index bd82101..526dfad 100644
--- a/tier-0/bootc.yaml
+++ b/tier-0/bootc.yaml
@@ -1,13 +1,8 @@
-# A relatively minimal base, but we also do include linux-firmware so
-# we can be directly booted on metal.
+# The bootc components.
 packages:
  - systemd
- # linux-firmware now a recommends so let's explicitly include it
- # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b
- # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide
- - linux-firmware
- - ostree
- # For now this will be shipped in rpm-ostree
+ - ostree nss-altfiles
+ # For now this will be shipped in rpm-ostree; TODO fix this by shipping a separate epackage
  # - bootc
  # Required by bootc install today, though we'll likely switch bootc to use a Rust crate instead of sgdisk
  - gdisk xfsprogs e2fsprogs dosfstools
diff --git a/tier-1/firmware.yaml b/tier-1/firmware.yaml
new file mode 100644
index 0000000..ca5e807
--- /dev/null
+++ b/tier-1/firmware.yaml
@@ -0,0 +1,5 @@
+ packages:
+  # linux-firmware now a recommends so let's explicitly include it
+  # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b
+  # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide
+  - linux-firmware
diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml
index 6fa54d1..5316cb0 100644
--- a/tier-1/manifest.yaml
+++ b/tier-1/manifest.yaml
@@ -1,6 +1,8 @@
 
 include:
   - manifest-tier-0.yaml
+  - bootable-rpm-ostree.yaml
+  - firmware.yaml
   - networking-tools.yaml
   - system-configuration.yaml
   - user-experience.yaml