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