diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index c51e4da109..c89e47455c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@03d1a1b4cdc474c55166a2f48be244748011206d
+      - uses: systemd/mkosi@660874417bbe355121d705d2a049af39ddf28b58
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 2f13079252..c35316edd9 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -120,7 +120,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@03d1a1b4cdc474c55166a2f48be244748011206d
+      - uses: systemd/mkosi@660874417bbe355121d705d2a049af39ddf28b58
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
diff --git a/.packit.yml b/.packit.yml
index 75d5f6557a..19fbce9cdd 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -19,7 +19,7 @@ actions:
   post-upstream-clone:
     # Use the Fedora Rawhide specfile
     - git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm
-    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/10-centos-fedora/mkosi.conf | cut -d= -f2)"'
+    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | cut -d= -f2)"'
     - bash -c 'echo "%bcond upstream 1" > .packit_rpm/systemd.spec.new'
     - bash -c 'echo "%define meson_extra_configure_options --werror" >> .packit_rpm/systemd.spec.new'
     - bash -c 'cat .packit_rpm/systemd.spec >> .packit_rpm/systemd.spec.new'
diff --git a/mkosi.conf b/mkosi.conf
index 033b92d591..8c3695bef2 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -23,11 +23,6 @@ PassEnvironment=
         ASAN_OPTIONS
         COVERAGE
         VCS_TAG
-        GIT_URL
-        GIT_SUBDIR
-        GIT_BRANCH
-        GIT_COMMIT
-        PKG_SUBDIR
 
 [Output]
 RepartDirectories=mkosi.repart
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
deleted file mode 100644
index 4de8b2bd58..0000000000
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=arch
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
-ToolsTreePackages=
-        base-devel
-        github-cli
-        lcov
-        mypy
-        ruff
-        shellcheck
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
deleted file mode 100644
index 2645e6df5d..0000000000
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|fedora
-ToolsTreeDistribution=|centos
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
-ToolsTreePackages=
-        python3-mypy
-        rpm-build
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
deleted file mode 100644
index b6715b5c50..0000000000
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|debian
-ToolsTreeDistribution=|ubuntu
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
-ToolsTreePackages=
-        gh
-        lcov
-        mypy
-        shellcheck
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
deleted file mode 100644
index b7af141964..0000000000
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=opensuse
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
-ToolsTreePackages=
-        gh
-        lcov
-        mypy
-        python3-ruff
-        rpm-build
-        ShellCheck
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf
deleted file mode 100644
index 075df65196..0000000000
--- a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|!centos
-ToolsTreeRelease=|!9
-
-[Build]
-# The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of
-# mkfs.ext4 enabled it by default, so we disable it explicitly. Except that older versions
-# of mkfs.ext4 don't know about "orphan_file" so we skip it on some tools tree variants where
-# we know "orphan_file" is not supported.
-Environment=
-        SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/arch/mkosi.conf
similarity index 82%
rename from mkosi.conf.d/10-arch/mkosi.conf
rename to mkosi.conf.d/arch/mkosi.conf
index 79c189bf03..f897d7d31c 100644
--- a/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.conf.d/arch/mkosi.conf
@@ -3,13 +3,6 @@
 [Match]
 Distribution=arch
 
-[Build]
-Environment=
-        GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
-        GIT_BRANCH=main
-        GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34
-        PKG_SUBDIR=arch
-
 [Content]
 VolatilePackages=
         systemd
diff --git a/mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/arch/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/arch/mkosi.conf.d/debug.conf
diff --git a/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
new file mode 100644
index 0000000000..6624458331
--- /dev/null
+++ b/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch
+
+[Build]
+Environment=
+        GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
+        GIT_BRANCH=main
+        GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34
+        PKG_SUBDIR=arch
diff --git a/mkosi.conf.d/10-arch/mkosi.prepare b/mkosi.conf.d/arch/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-arch/mkosi.prepare
rename to mkosi.conf.d/arch/mkosi.prepare
diff --git a/mkosi.conf.d/20-build.conf b/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.conf.d/20-build.conf
rename to mkosi.conf.d/build.conf
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/centos-fedora/mkosi.conf
similarity index 86%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf
index 6f996fd578..7c941046f7 100644
--- a/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -4,13 +4,6 @@
 Distribution=|centos
 Distribution=|fedora
 
-[Build]
-Environment=
-        GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
-        GIT_BRANCH=rawhide
-        GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91
-        PKG_SUBDIR=fedora
-
 [Content]
 VolatilePackages=
         systemd
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf
diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
new file mode 100644
index 0000000000..63caaede59
--- /dev/null
+++ b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|centos
+Distribution=|fedora
+
+[Build]
+Environment=
+        GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
+        GIT_BRANCH=rawhide
+        GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91
+        PKG_SUBDIR=fedora
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.prepare b/mkosi.conf.d/centos-fedora/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.prepare
rename to mkosi.conf.d/centos-fedora/mkosi.prepare
diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/centos/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf
rename to mkosi.conf.d/centos/mkosi.conf
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
rename to mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
rename to mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf
similarity index 86%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf
index 3b85be300b..30138c00fb 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -4,14 +4,6 @@
 Distribution=|debian
 Distribution=|ubuntu
 
-[Build]
-Environment=
-        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
-        GIT_SUBDIR=debian
-        GIT_BRANCH=debian/master
-        GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990
-        PKG_SUBDIR=debian
-
 [Content]
 VolatilePackages=
         libnss-myhostname
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf
diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
new file mode 100644
index 0000000000..1f8fe976f4
--- /dev/null
+++ b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Build]
+Environment=
+        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
+        GIT_SUBDIR=debian
+        GIT_BRANCH=debian/master
+        GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990
+        PKG_SUBDIR=debian
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare b/mkosi.conf.d/debian-ubuntu/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.prepare
rename to mkosi.conf.d/debian-ubuntu/mkosi.prepare
diff --git a/mkosi.conf.d/10-debian/mkosi.conf b/mkosi.conf.d/debian/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf
rename to mkosi.conf.d/debian/mkosi.conf
diff --git a/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf b/mkosi.conf.d/debian/mkosi.conf.d/arm64.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf
rename to mkosi.conf.d/debian/mkosi.conf.d/arm64.conf
diff --git a/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf b/mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf
rename to mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf
diff --git a/mkosi.conf.d/20-extra-search-path.conf b/mkosi.conf.d/extra-search-path.conf
similarity index 100%
rename from mkosi.conf.d/20-extra-search-path.conf
rename to mkosi.conf.d/extra-search-path.conf
diff --git a/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.conf.d/fedora/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-fedora/mkosi.conf
rename to mkosi.conf.d/fedora/mkosi.conf
diff --git a/mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide-42.conf b/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
similarity index 100%
rename from mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide-42.conf
rename to mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
diff --git a/mkosi.conf.d/20-none.conf b/mkosi.conf.d/none.conf
similarity index 100%
rename from mkosi.conf.d/20-none.conf
rename to mkosi.conf.d/none.conf
diff --git a/mkosi.conf.d/10-opensuse/macros.db_backend b/mkosi.conf.d/opensuse/macros.db_backend
similarity index 100%
rename from mkosi.conf.d/10-opensuse/macros.db_backend
rename to mkosi.conf.d/opensuse/macros.db_backend
diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/opensuse/mkosi.conf
similarity index 88%
rename from mkosi.conf.d/10-opensuse/mkosi.conf
rename to mkosi.conf.d/opensuse/mkosi.conf
index 6509ea4f16..32ff446fec 100644
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/opensuse/mkosi.conf
@@ -9,12 +9,6 @@ Repositories=non-oss
 
 [Build]
 SandboxTrees=macros.db_backend:/etc/rpm/macros.db_backend
-Environment=
-        GIT_URL=https://github.com/bmwiedemann/openSUSE
-        GIT_SUBDIR=packages/s/systemd
-        GIT_BRANCH=master
-        GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0
-        PKG_SUBDIR=opensuse
 
 [Content]
 VolatilePackages=
diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
diff --git a/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
new file mode 100644
index 0000000000..ac1ddf5e92
--- /dev/null
+++ b/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=opensuse
+
+[Build]
+Environment=
+        GIT_URL=https://github.com/bmwiedemann/openSUSE
+        GIT_SUBDIR=packages/s/systemd
+        GIT_BRANCH=master
+        GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0
+        PKG_SUBDIR=opensuse
diff --git a/mkosi.conf.d/10-opensuse/mkosi.prepare b/mkosi.conf.d/opensuse/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-opensuse/mkosi.prepare
rename to mkosi.conf.d/opensuse/mkosi.prepare
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.conf.d/ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
similarity index 59%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
index 8e0e3c0d78..255358967c 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
+++ b/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
@@ -7,4 +7,4 @@ Architecture=!x86
 Release=noble
 
 [Build]
-SandboxTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
similarity index 62%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
index e0e96b2c18..5463bd794a 100644
--- a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
+++ b/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
@@ -7,4 +7,4 @@ Architecture=|x86
 Release=noble
 
 [Build]
-SandboxTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
diff --git a/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources b/mkosi.conf.d/ubuntu/noble-backports-ports.sources
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/noble-backports-ports.sources
rename to mkosi.conf.d/ubuntu/noble-backports-ports.sources
diff --git a/mkosi.conf.d/10-ubuntu/noble-backports.sources b/mkosi.conf.d/ubuntu/noble-backports.sources
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/noble-backports.sources
rename to mkosi.conf.d/ubuntu/noble-backports.sources
diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
index d7a79d11c1..2e54455354 100644
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
@@ -3,6 +3,9 @@
 [Match]
 Distribution=arch
 
+[Include]
+Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
+
 [Content]
 Packages=
         base
diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
index 4d0ca8917d..89fdfc4b20 100644
--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -4,6 +4,9 @@
 Distribution=|centos
 Distribution=|fedora
 
+[Include]
+Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
+
 [Content]
 Packages=
         clang-devel
diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
index 81c79a2c21..7fac74772b 100644
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -4,6 +4,9 @@
 Distribution=|debian
 Distribution=|ubuntu
 
+[Include]
+Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
+
 [Content]
 Packages=
         apt
diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index 70a1b31b64..00a45fce5b 100644
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
@@ -3,6 +3,9 @@
 [Match]
 Distribution=opensuse
 
+[Include]
+Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
+
 [Content]
 Packages=
         clang
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf b/mkosi.images/exitrd/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-arch.conf
rename to mkosi.images/exitrd/mkosi.conf.d/arch.conf
diff --git a/mkosi.images/exitrd/mkosi.conf.d/20-build.conf b/mkosi.images/exitrd/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/20-build.conf
rename to mkosi.images/exitrd/mkosi.conf.d/build.conf
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-centos-fedora.conf
rename to mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-debian.conf b/mkosi.images/exitrd/mkosi.conf.d/debian.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-debian.conf
rename to mkosi.images/exitrd/mkosi.conf.d/debian.conf
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf b/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf
rename to mkosi.images/exitrd/mkosi.conf.d/opensuse.conf
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf b/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf
rename to mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-arch.conf b/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-arch.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/arch.conf
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/20-build.conf b/mkosi.images/minimal-base/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/20-build.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/build.conf
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-centos-fedora.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-debian-ubuntu.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
diff --git a/mkosi.conf.d/05-tools/mkosi.conf b/mkosi.tools.conf/mkosi.conf
similarity index 70%
rename from mkosi.conf.d/05-tools/mkosi.conf
rename to mkosi.tools.conf/mkosi.conf
index adbbf98ebf..a83e07a13e 100644
--- a/mkosi.conf.d/05-tools/mkosi.conf
+++ b/mkosi.tools.conf/mkosi.conf
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Build]
-ToolsTreeSyncScripts=%D/mkosi.sync
-ToolsTreePackages=
+[Content]
+SyncScripts=%D/mkosi.sync
+Packages=
         gdb
         llvm
         meson # Also needed in the NO_BUILD case so we list it explicitly.
diff --git a/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi.tools.conf/mkosi.conf.d/arch.conf
new file mode 100644
index 0000000000..75570ffe0c
--- /dev/null
+++ b/mkosi.tools.conf/mkosi.conf.d/arch.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch
+
+[Include]
+Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
+Packages=
+        base-devel
+        github-cli
+        lcov
+        mypy
+        ruff
+        shellcheck
diff --git a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf
new file mode 100644
index 0000000000..8f5f07addf
--- /dev/null
+++ b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|fedora
+Distribution=|centos
+
+[Include]
+Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
+Packages=
+        python3-mypy
+        rpm-build
diff --git a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf
new file mode 100644
index 0000000000..0a34b867c9
--- /dev/null
+++ b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Include]
+Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+Packages=
+        gh
+        lcov
+        mypy
+        shellcheck
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf b/mkosi.tools.conf/mkosi.conf.d/fedora.conf
similarity index 66%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf
rename to mkosi.tools.conf/mkosi.conf.d/fedora.conf
index 66592b86ad..e32cf27e98 100644
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf
+++ b/mkosi.tools.conf/mkosi.conf.d/fedora.conf
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=fedora
+Distribution=fedora
 
-[Build]
-ToolsTreePackages=
+[Content]
+Packages=
         lcov
         gh
         ruff
diff --git a/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf
new file mode 100644
index 0000000000..6fd1c746d6
--- /dev/null
+++ b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=opensuse
+
+[Include]
+Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
+Packages=
+        gh
+        lcov
+        mypy
+        python3-ruff
+        rpm-build
+        ShellCheck
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf
similarity index 65%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf
rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf
index 3078782ae3..b9fd7bcf34 100644
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf
+++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=ubuntu
+Distribution=ubuntu
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
similarity index 51%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
index bbddf8e25f..255358967c 100644
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
+++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
@@ -4,7 +4,7 @@
 [Match]
 Architecture=!x86-64
 Architecture=!x86
-ToolsTreeRelease=noble
+Release=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
similarity index 53%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
index 9a6aa05cfb..5463bd794a 100644
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
+++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
@@ -4,7 +4,7 @@
 [Match]
 Architecture=|x86-64
 Architecture=|x86
-ToolsTreeRelease=noble
+Release=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
diff --git a/test/integration-tests/README.md b/test/integration-tests/README.md
index 3f477dcba6..1314bf0131 100644
--- a/test/integration-tests/README.md
+++ b/test/integration-tests/README.md
@@ -169,9 +169,9 @@ ToolsTree=
 
 On the other hand, if the rpms are available but not installed on the host
 system, you'll want to make sure they're installed into the mkosi tools tree so
-that they're used to build the image by using either
-`ToolsTreePackageDirectories=` or `ToolsTreeSandboxTrees=` similarly to
-`PackageDirectories=` or `SandboxTrees=` mentioned above.
+that they're used to build the image by again using either
+`PackageDirectories=` or `SandboxTrees=`, but this time in
+`mkosi.tools.conf/mkosi.local.conf` instead of `mkosi.local.conf`.
 
 Finally, we'll make use of the standalone mode of running the integration tests
 to avoid having to install any build dependencies.
diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py
index 77c46d45a2..c7d30f18c1 100755
--- a/tools/fetch-distro.py
+++ b/tools/fetch-distro.py
@@ -127,7 +127,7 @@ def update_distro(args, distro: str, config: dict):
     changes = subprocess.check_output(cmd, text=True).strip()
 
     conf_dir = Path('mkosi.conf.d')
-    files = conf_dir.glob('*/*.conf')
+    files = conf_dir.glob('**/pkgenv.conf')
     for file in files:
         s = file.read_text()
         if old_commit in s: