diff --git a/desktops/base/fedora-common-ostree.yaml b/desktops/base/fedora-common-ostree.yaml
index 30597d8..c139500 100644
--- a/desktops/base/fedora-common-ostree.yaml
+++ b/desktops/base/fedora-common-ostree.yaml
@@ -8,10 +8,6 @@ include:
   # - bootupd.yaml
 
 packages:
-  # Ensure that we have a kernel. Kernel packages are not in any comps group
-  - kernel
-  - kernel-modules
-  - kernel-modules-extra
   # Do not include "full" Git as it brings in Perl
   - git-core
   # Explicitely add Git docs
diff --git a/fedora-bootc-atomic-base.yaml b/fedora-bootc-atomic-base.yaml
index f965658..132f93e 100644
--- a/fedora-bootc-atomic-base.yaml
+++ b/fedora-bootc-atomic-base.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Base
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/base/manifest.yaml
diff --git a/fedora-bootc-atomic-budgie.yaml b/fedora-bootc-atomic-budgie.yaml
index 41b6d53..2c9a6a0 100644
--- a/fedora-bootc-atomic-budgie.yaml
+++ b/fedora-bootc-atomic-budgie.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Budgie
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/budgie/manifest.yaml
diff --git a/fedora-bootc-atomic-cinnamon.yaml b/fedora-bootc-atomic-cinnamon.yaml
index 1c7758a..bcb4e39 100644
--- a/fedora-bootc-atomic-cinnamon.yaml
+++ b/fedora-bootc-atomic-cinnamon.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Cinnamon
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/cinnamon/manifest.yaml
diff --git a/fedora-bootc-atomic-deepin.yaml b/fedora-bootc-atomic-deepin.yaml
index 00666c6..bd365aa 100644
--- a/fedora-bootc-atomic-deepin.yaml
+++ b/fedora-bootc-atomic-deepin.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Deepin
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/deepin/manifest.yaml
diff --git a/fedora-bootc-atomic-kinoite.yaml b/fedora-bootc-atomic-kinoite.yaml
index d708230..c23e91b 100644
--- a/fedora-bootc-atomic-kinoite.yaml
+++ b/fedora-bootc-atomic-kinoite.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Kinoite
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/kinoite/manifest.yaml
diff --git a/fedora-bootc-atomic-lxqt.yaml b/fedora-bootc-atomic-lxqt.yaml
index c2efa1c..ea0c06e 100644
--- a/fedora-bootc-atomic-lxqt.yaml
+++ b/fedora-bootc-atomic-lxqt.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic LXQt
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/lxqt/manifest.yaml
diff --git a/fedora-bootc-atomic-mate.yaml b/fedora-bootc-atomic-mate.yaml
index 86ff49b..6edb43a 100644
--- a/fedora-bootc-atomic-mate.yaml
+++ b/fedora-bootc-atomic-mate.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic MATE
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/mate/manifest.yaml
diff --git a/fedora-bootc-atomic-silverblue.yaml b/fedora-bootc-atomic-silverblue.yaml
index 2c7ef08..a4738ca 100644
--- a/fedora-bootc-atomic-silverblue.yaml
+++ b/fedora-bootc-atomic-silverblue.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Silverblue
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/silverblue/manifest.yaml
diff --git a/fedora-bootc-atomic-sway.yaml b/fedora-bootc-atomic-sway.yaml
index df9b673..9c9b42e 100644
--- a/fedora-bootc-atomic-sway.yaml
+++ b/fedora-bootc-atomic-sway.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic Sway
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/sway/manifest.yaml
diff --git a/fedora-bootc-atomic-xfce.yaml b/fedora-bootc-atomic-xfce.yaml
index 423b24d..036f906 100644
--- a/fedora-bootc-atomic-xfce.yaml
+++ b/fedora-bootc-atomic-xfce.yaml
@@ -11,6 +11,6 @@ metadata:
   summary: Fedora Bootable Atomic XFCE
 
 include:
-  - base-images/tier-0/kernel.yaml
-  - base-images/tier-0/manifest.yaml
+  - base-images/tier-x/kernel.yaml
+  - base-images/tier-x/manifest.yaml
   - desktops/xfce/manifest.yaml