diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index e9b0bab..0000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-/* @fedora-iot/iot-team
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9b5219c..afb25fb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,3 +6,5 @@ updates:
       interval: "daily"
     commit-message:
       prefix: "Submodule Update: "
+      reviewers:
+        - "fedora-iot/iot-team"
diff --git a/.gitmodules b/.gitmodules
index 76e27a9..6aa44fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "base-images"]
 	path = base-images
 	url = https://gitlab.com/fedora/bootc/base-images.git
+	branch = f41-stable
diff --git a/base-images b/base-images
index df1f1d2..f32c452 160000
--- a/base-images
+++ b/base-images
@@ -1 +1 @@
-Subproject commit df1f1d29ec6ce29c769f8fff1efba0ab84d534a1
+Subproject commit f32c45268e49a04cd6e0a664a32d43f9e3b36c47
diff --git a/fedora-iot-42.yaml b/fedora-iot-42.yaml
index 54dbe68..134eb1e 100644
--- a/fedora-iot-42.yaml
+++ b/fedora-iot-42.yaml
@@ -1,5 +1,4 @@
 releasever: 42
 repos:
-  - fedora
-  - fedora-updates
+  - fedora-devel
 include: fedora-iot-bootc.yaml
diff --git a/fedora-iot-43.yaml b/fedora-iot-43.yaml
deleted file mode 100644
index 7993852..0000000
--- a/fedora-iot-43.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-releasever: 43
-repos:
-  - fedora
-  - fedora-updates
-include: fedora-iot-bootc.yaml
-packages:
-  - ssh-key-dir
diff --git a/fedora-iot-44.yaml b/fedora-iot-44.yaml
deleted file mode 100644
index e10fc8b..0000000
--- a/fedora-iot-44.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-releasever: 44
-repos:
-  - fedora
-  - fedora-updates
-include: fedora-iot-bootc.yaml
diff --git a/fedora-iot-45.yaml b/fedora-iot-45.yaml
deleted file mode 100644
index 855aaa7..0000000
--- a/fedora-iot-45.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-releasever: 45
-repos:
-  - fedora-devel
-include: fedora-iot-bootc.yaml
diff --git a/fedora-iot-bootc.yaml b/fedora-iot-bootc.yaml
index f2839bc..dd5cf9c 100644
--- a/fedora-iot-bootc.yaml
+++ b/fedora-iot-bootc.yaml
@@ -6,7 +6,6 @@ metadata:
   summary: Fedora IoT bootc image
 
 include:
-  - base-images/minimal-plus/manifest.yaml
-  - base-images/fedora-includes/generic.yaml
-  - base-images/standard/persistent-journal.yaml
+  - base-images/tier-x/manifest.yaml
+  - base-images/tier-x/kernel.yaml
   - iot-packages.yaml
diff --git a/iot-packages.yaml b/iot-packages.yaml
index 1e3b140..2b91048 100644
--- a/iot-packages.yaml
+++ b/iot-packages.yaml
@@ -56,6 +56,7 @@ packages:
   - setup
   - shadow-utils
   - slirp4netns
+  - ssh-key-dir
   - sssd-client
   - tmux
   - tpm2-pkcs11