diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 7b9ad6a67f..55bbad2bde 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,13 +76,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
-    - uses: systemd/mkosi@cb5974d013f7c4c2a45f67c9ae990767e32e9034
+    - uses: systemd/mkosi@adaa41512aa30c952daae5ba0abcf2622d66b93b
 
     - name: Configure
       run: |
-        # We configure ExtraSearchPaths=build/ so make sure build/ exists.
-        mkdir build/
-
         tee mkosi.conf <<- EOF
         [Distribution]
         Distribution=${{ matrix.distro }}
diff --git a/mkosi.conf.d/10-extra-search-paths.conf b/mkosi.conf.d/10-extra-search-paths.conf
new file mode 100644
index 0000000000..bd3cdb1de4
--- /dev/null
+++ b/mkosi.conf.d/10-extra-search-paths.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+PathExists=build/
+
+[Host]
+ExtraSearchPaths=build/
diff --git a/mkosi.conf.d/10-fedora.conf b/mkosi.conf.d/10-fedora.conf
index 0196c9f745..006cdeded8 100644
--- a/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.conf.d/10-fedora.conf
@@ -4,4 +4,4 @@
 Distribution=fedora
 
 [Distribution]
-@Release=38
+@Release=39
diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index f25d53d2b7..b2921ffc67 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Preset]
+Presets=system
+
 [Output]
 OutputDirectory=mkosi.output
 BuildDirectory=mkosi.builddir
@@ -14,7 +17,6 @@ Environment=ASAN_OPTIONS=verify_asan_link_order=false
 [Host]
 @Incremental=yes
 @QemuMem=2G
-ExtraSearchPaths=build/
 # Make sure we don't trigger systemd-firstboot prompting for the root password.
 Credentials=passwd.plaintext-password.root=
 KernelCommandLineExtra=systemd.crash_shell
diff --git a/mkosi.conf.d/10-tools.conf b/mkosi.conf.d/10-tools.conf
new file mode 100644
index 0000000000..21bdea5809
--- /dev/null
+++ b/mkosi.conf.d/10-tools.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+PathExists=!build/
+SystemdVersion=<254
+
+[Host]
+ToolsTree=default
diff --git a/mkosi.presets/initrd/mkosi.conf b/mkosi.presets/initrd/mkosi.conf
index 5d347b71d8..0ef3a7bd4a 100644
--- a/mkosi.presets/initrd/mkosi.conf
+++ b/mkosi.presets/initrd/mkosi.conf
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Bootable=|auto
-Bootable=|yes
-
 [Preset]
 Dependencies=base
 
diff --git a/mkosi.presets/system/mkosi.conf b/mkosi.presets/system/mkosi.conf
index 0cccf98fd8..361bb6af72 100644
--- a/mkosi.presets/system/mkosi.conf
+++ b/mkosi.presets/system/mkosi.conf
@@ -2,14 +2,12 @@
 
 [Preset]
 Dependencies=base
-             initrd
 
 [Content]
 Autologin=yes
 BaseTrees=../../mkosi.output/base
 ExtraTrees=../../mkosi.output/base-systemd
 ExtraTrees=../../src:/usr/src/src
-Initrds=../../mkosi.output/initrd
 Packages=
         acl
         bash-completion
diff --git a/mkosi.presets/system/mkosi.conf.d/05-initrd.conf b/mkosi.presets/system/mkosi.conf.d/05-initrd.conf
new file mode 100644
index 0000000000..e5dedafdc3
--- /dev/null
+++ b/mkosi.presets/system/mkosi.conf.d/05-initrd.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Bootable=!no
+Format=disk
+
+[Preset]
+Dependencies=initrd
+
+[Content]
+Initrds=../../mkosi.output/initrd