diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index cec8a432d28..e5e3646509b 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -73,7 +73,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-    - uses: systemd/mkosi@af1fe54805c84bb09e80bb585399121946fec701
+    - uses: systemd/mkosi@f219c1125893e8773efed5ec8a1226f3bd8a00cb
 
     - name: Configure
       run: |
diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index bbb3544f1f3..2c7eb63e71c 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-
 [Output]
 Bootable=yes
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.
@@ -12,7 +10,7 @@ OutputDirectory=mkosi.output
 
 [Content]
 BuildDirectory=mkosi.builddir
-Cache=mkosi.cache
+CacheDirectory=mkosi.cache
 ExtraTrees=src:/root/src
 Packages=
         acl
diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/20-arch.conf
similarity index 78%
rename from mkosi.conf.d/arch/10-arch.conf
rename to mkosi.conf.d/20-arch.conf
index 30333cff3a9..c926c88c1a0 100644
--- a/mkosi.conf.d/arch/10-arch.conf
+++ b/mkosi.conf.d/20-arch.conf
@@ -2,10 +2,7 @@
 #
 # Copyright © 2016 Zeal Jagannatha
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
-
-[Distribution]
+[Match]
 Distribution=arch
 
 [Content]
diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/20-centos.conf
similarity index 66%
rename from mkosi.conf.d/centos/10-centos.conf
rename to mkosi.conf.d/20-centos.conf
index ff26e3611fd..09b79731952 100644
--- a/mkosi.conf.d/centos/10-centos.conf
+++ b/mkosi.conf.d/20-centos.conf
@@ -1,16 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
-
-# We use python3[.][9]dist() throughout this file because we need to make sure the python3.9dis() packages
-# are installed on CentOS Stream 8. mkosi doesn't support release specific configuration yet so we use the
-# globs to get the necessary packages on both CentOS Stream 8 and CentOS Stream 9.
+[Match]
+Distribution=centos
 
 [Distribution]
-Distribution=centos
 Repositories=epel
-RepositoryDirectory=mkosi.conf.d/centos/mkosi.reposdir
 
 [Content]
 Packages=
@@ -45,11 +39,7 @@ Packages=
         polkit
         popt
         procps-ng
-        python3[.][9]dist(pefile)
-        python3[.][9]dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
-        python3[.][9]dist(psutil)
-        python3[.][9]dist(pytest)
-        python39
+        python3-docutils
         quota
         tpm2-tss
         vim-common
@@ -61,7 +51,6 @@ BuildPackages=
         glibc-devel.i686
         glibc-static
         glibc-static.i686
-        libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
         libxslt
         pam-devel
         perl-interpreter
@@ -102,7 +91,3 @@ BuildPackages=
         pkgconfig(tss2-rc)
         pkgconfig(valgrind)
         pkgconfig(xkbcommon)
-        python3-docutils
-        python3[.][9]dist(jinja2)
-        python3[.][9]dist(lxml)
-        python3[.][9]dist(pyelftools)
diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/20-debian.conf
similarity index 90%
rename from mkosi.conf.d/debian/10-debian.conf
rename to mkosi.conf.d/20-debian.conf
index c3e582b8ecf..5244194a01d 100644
--- a/mkosi.conf.d/debian/10-debian.conf
+++ b/mkosi.conf.d/20-debian.conf
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
+[Match]
+Distribution=debian
 
 [Distribution]
-Distribution=debian
 Release=testing
 
 [Content]
diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/20-fedora.conf
similarity index 91%
rename from mkosi.conf.d/fedora/10-fedora.conf
rename to mkosi.conf.d/20-fedora.conf
index b263cce6738..5967c3670f3 100644
--- a/mkosi.conf.d/fedora/10-fedora.conf
+++ b/mkosi.conf.d/20-fedora.conf
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
+[Match]
+Distribution=fedora
 
 [Distribution]
-Distribution=fedora
 Release=37
 
 [Content]
diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/20-opensuse.conf
similarity index 91%
rename from mkosi.conf.d/opensuse/10-opensuse.conf
rename to mkosi.conf.d/20-opensuse.conf
index 1e03c79cff2..96093951e1d 100644
--- a/mkosi.conf.d/opensuse/10-opensuse.conf
+++ b/mkosi.conf.d/20-opensuse.conf
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
+[Match]
+Distribution=opensuse
 
 [Distribution]
-Distribution=opensuse
 Release=tumbleweed
 
 [Content]
diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf
similarity index 90%
rename from mkosi.conf.d/ubuntu/10-ubuntu.conf
rename to mkosi.conf.d/20-ubuntu.conf
index 51898475b0b..97deb709473 100644
--- a/mkosi.conf.d/ubuntu/10-ubuntu.conf
+++ b/mkosi.conf.d/20-ubuntu.conf
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image.
+[Match]
+Distribution=ubuntu
 
 [Distribution]
-Distribution=ubuntu
 Release=jammy
 Repositories=main,universe
 
diff --git a/mkosi.conf.d/21-centos-8/mkosi.conf b/mkosi.conf.d/21-centos-8/mkosi.conf
new file mode 100644
index 00000000000..d610212b611
--- /dev/null
+++ b/mkosi.conf.d/21-centos-8/mkosi.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+Release=8
+
+[Content]
+Packages=
+        python39
+        python3.9dist(pefile)
+        python3.9dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
+        python3.9dist(psutil)
+        python3.9dist(pytest)
+
+BuildPackages=
+        libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
+        python3.9dist(jinja2)
+        python3.9dist(lxml)
+        python3.9dist(pyelftools)
diff --git a/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo b/mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo
similarity index 84%
rename from mkosi.conf.d/centos/mkosi.reposdir/powertools.repo
rename to mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo
index 5c7149a1233..1462257c087 100644
--- a/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo
+++ b/mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 [powertools-hotfixes]
 name=powertools-hotfixes
 mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools
diff --git a/mkosi.conf.d/21-centos-9.conf b/mkosi.conf.d/21-centos-9.conf
new file mode 100644
index 00000000000..0febf2c2eeb
--- /dev/null
+++ b/mkosi.conf.d/21-centos-9.conf
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+Release=9
+
+[Content]
+Packages=
+        python3dist(pefile)
+        python3dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
+        python3dist(psutil)
+        python3dist(pytest)
+
+BuildPackages=
+        pkgconfig(libgcrypt)
+        python3dist(jinja2)
+        python3dist(lxml)
+        python3dist(pyelftools)