diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index d974152be1..7e82b63abe 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -73,7 +73,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-    - uses: systemd/mkosi@ebc8b63f3be58243c7ff4273517fa4d2858c7e30
+    - uses: systemd/mkosi@0900374cd1f2cc0b1b3367662360faa15542127e
 
     - name: Configure
       run: |
@@ -100,12 +100,12 @@ jobs:
     - name: Generate secure boot key
       run: mkosi genkey
 
-    - name: Build ${{ matrix.distro }}
-      run: mkosi
-
     - name: Show ${{ matrix.distro }} image summary
       run: mkosi summary
 
+    - name: Build ${{ matrix.distro }}
+      run: mkosi
+
     - name: Boot ${{ matrix.distro }} systemd-nspawn
       run: sudo mkosi boot
 
diff --git a/mkosi.conf.d/20-centos-fedora.conf b/mkosi.conf.d/20-centos-fedora.conf
new file mode 100644
index 0000000000..d78b924304
--- /dev/null
+++ b/mkosi.conf.d/20-centos-fedora.conf
@@ -0,0 +1,94 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos fedora
+
+[Content]
+Packages=
+        alsa-lib
+        audit-libs
+        cryptsetup
+        dhcp-server
+        dnf
+        fuse
+        glib2
+        glibc-minimal-langpack
+        glibc.i686
+        gnutls
+        iproute
+        iproute-tc
+        kernel-core
+        libasan
+        libbpf
+        libcap-ng
+        libcap-ng-utils
+        libfido2
+        libgcrypt
+        libmicrohttpd
+        libmnl
+        libubsan
+        libxcrypt
+        libxkbcommon
+        netcat
+        numactl-libs
+        openssh-server
+        p11-kit
+        pam
+        passwd
+        polkit
+        popt
+        procps-ng
+        quota
+        tpm2-tss
+        util-linux
+        vim-common
+
+BuildPackages=
+        /usr/bin/pkg-config
+        bpftool
+        docbook-xsl
+        dwarves
+        glibc-devel.i686
+        glibc-static
+        glibc-static.i686
+        libxslt
+        pam-devel
+        perl-interpreter
+        pkgconfig(alsa)
+        pkgconfig(audit)
+        pkgconfig(blkid)
+        pkgconfig(bzip2)
+        pkgconfig(dbus-1)
+        pkgconfig(fdisk)
+        pkgconfig(fuse)
+        pkgconfig(glib-2.0)
+        pkgconfig(gnutls)
+        pkgconfig(libacl)
+        pkgconfig(libbpf)
+        pkgconfig(libcap-ng)
+        pkgconfig(libcap)
+        pkgconfig(libcryptsetup)
+        pkgconfig(libcurl)
+        pkgconfig(libdw)
+        pkgconfig(libfido2)
+        pkgconfig(libidn2)
+        pkgconfig(libkmod)
+        pkgconfig(libmicrohttpd)
+        pkgconfig(libmnl)
+        pkgconfig(libpcre2-8)
+        pkgconfig(libqrencode)
+        pkgconfig(libseccomp)
+        pkgconfig(libselinux)
+        pkgconfig(libzstd)
+        pkgconfig(mount)
+        pkgconfig(numa)
+        pkgconfig(openssl)
+        pkgconfig(p11-kit-1)
+        pkgconfig(popt)
+        pkgconfig(pwquality)
+        pkgconfig(tss2-esys)
+        pkgconfig(tss2-mu)
+        pkgconfig(tss2-rc)
+        pkgconfig(valgrind)
+        pkgconfig(xkbcommon)
+        python3-docutils
diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
index 0ddf6e37ea..4181f03414 100644
--- a/mkosi.conf.d/20-centos.conf
+++ b/mkosi.conf.d/20-centos.conf
@@ -4,93 +4,5 @@
 Distribution=centos
 
 [Distribution]
+Release=9
 Repositories=epel
-
-[Content]
-Packages=
-        alsa-lib
-        audit
-        cryptsetup
-        dhcp-server
-        dnf
-        fuse
-        glib2
-        glibc-minimal-langpack
-        glibc.i686
-        gnutls
-        iproute
-        iproute-tc
-        kernel-core
-        libasan
-        libbpf
-        libcap-ng
-        libcap-ng-utils
-        libfido2
-        libmicrohttpd
-        libmnl
-        libubsan
-        libxcrypt
-        libxkbcommon
-        netcat
-        numactl-libs
-        openssh-server
-        p11-kit
-        pam
-        passwd
-        polkit
-        popt
-        procps-ng
-        python3-docutils
-        quota
-        tpm2-tss
-        util-linux
-        vim-common
-
-BuildPackages=
-        bpftool
-        docbook-xsl
-        dwarves
-        glibc-devel.i686
-        glibc-static
-        glibc-static.i686
-        libxslt
-        pam-devel
-        perl-interpreter
-        /usr/bin/pkg-config
-        pkgconfig(alsa)
-        pkgconfig(audit)
-        pkgconfig(blkid)
-        pkgconfig(bzip2)
-        pkgconfig(dbus-1)
-        pkgconfig(fdisk)
-        pkgconfig(fuse)
-        pkgconfig(glib-2.0)
-        pkgconfig(gnutls)
-        pkgconfig(libacl)
-        pkgconfig(libbpf)
-        pkgconfig(libcap-ng)
-        pkgconfig(libcap)
-        pkgconfig(libcryptsetup)
-        pkgconfig(libcurl)
-        pkgconfig(libdw)
-        pkgconfig(libfido2)
-        pkgconfig(libidn2)
-        pkgconfig(libkmod)
-        pkgconfig(libmicrohttpd)
-        pkgconfig(libmnl)
-        pkgconfig(libpcre2-8)
-        pkgconfig(libqrencode)
-        pkgconfig(libseccomp)
-        pkgconfig(libselinux)
-        pkgconfig(libzstd)
-        pkgconfig(mount)
-        pkgconfig(numa)
-        pkgconfig(openssl)
-        pkgconfig(p11-kit-1)
-        pkgconfig(popt)
-        pkgconfig(pwquality)
-        pkgconfig(tss2-esys)
-        pkgconfig(tss2-mu)
-        pkgconfig(tss2-rc)
-        pkgconfig(valgrind)
-        pkgconfig(xkbcommon)
diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu.conf
new file mode 100644
index 0000000000..584536ef6b
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu.conf
@@ -0,0 +1,97 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian ubuntu
+
+[Content]
+Packages=
+        btrfs-progs
+        cryptsetup-bin
+        dbus-broker
+        default-dbus-session-bus
+        f2fs-tools
+        fdisk
+        fuse
+        gcc # Provides libasan/libubsan
+        iproute2
+        isc-dhcp-server
+        libasound2
+        libc6-i386
+        libcap-ng-utils
+        libcap-ng0
+        libfdisk1
+        libfido2-1
+        libglib2.0-0
+        libgnutls30
+        libidn2-0
+        libmicrohttpd12
+        libmnl0
+        libnuma1
+        libp11-kit0
+        libpam0g
+        libpopt0
+        libpwquality1
+        libqrencode4
+        libtss2-dev # Use the -dev package to avoid churn in updating version numbers
+        netcat-openbsd
+        openssh-server
+        passwd
+        policykit-1
+        procps
+        python3-pefile
+        python3-psutil
+        python3-pytest
+        quota
+        systemd-sysv
+        tzdata
+        xxd
+
+BuildPackages=
+        docbook-xsl
+        dpkg-dev
+        g++
+        gcc-multilib
+        libacl1-dev
+        libasound-dev
+        libaudit-dev
+        libblkid-dev
+        libbpf-dev
+        libbz2-dev
+        libc6-dev
+        libc6-dev-i386
+        libcap-dev
+        libcap-ng-dev
+        libcryptsetup-dev
+        libcurl4-openssl-dev
+        libdbus-1-dev
+        libdw-dev
+        libfdisk-dev
+        libfido2-dev
+        libfuse-dev
+        libgcrypt20-dev
+        libglib2.0-dev
+        libgnutls28-dev
+        libidn2-dev
+        libiptc-dev
+        libkmod-dev
+        libmicrohttpd-dev
+        libmnl-dev
+        libmount-dev
+        libnuma-dev
+        libp11-kit-dev
+        libpam0g-dev
+        libpopt-dev
+        libpwquality-dev
+        libqrencode-dev
+        libseccomp-dev
+        libsmartcols-dev
+        libssl-dev
+        libxen-dev
+        libxkbcommon-dev
+        libzstd-dev
+        pahole
+        python3-docutils
+        python3-jinja2
+        python3-lxml
+        python3-pyelftools
+        xsltproc
diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf
index 4354b05bf0..c251ab6542 100644
--- a/mkosi.conf.d/20-debian.conf
+++ b/mkosi.conf.d/20-debian.conf
@@ -8,95 +8,8 @@ Release=testing
 
 [Content]
 Packages=
-        btrfs-progs
-        cryptsetup-bin
-        dbus-broker
-        default-dbus-session-bus
-        f2fs-tools
-        fdisk
-        fuse
-        gcc # Provides libasan/libubsan
-        iproute2
-        isc-dhcp-server
-        libasound2
         libbpf1
-        libc6-i386
-        libcap-ng-utils
-        libcap-ng0
-        libfido2-1
-        libglib2.0-0
-        libgnutls30
-        libidn2-0
-        libmicrohttpd12
-        libmnl0
-        libnuma1
-        libp11-kit0
-        libpam0g
-        libpopt0
-        libpwquality1
-        libqrencode4
-        libtss2-dev # Use the -dev package to avoid churn in updating version numbers
         linux-image-cloud-amd64
-        netcat-openbsd
-        openssh-server
-        passwd
-        policykit-1
-        procps
-        python3-pefile
-        python3-psutil
-        python3-pytest
-        quota
-        systemd-sysv
-        tzdata
-        xxd
 
 BuildPackages=
         bpftool
-        docbook-xsl
-        dpkg-dev
-        g++
-        gcc-multilib
-        libacl1-dev
-        libasound-dev
-        libaudit-dev
-        libblkid-dev
-        libbpf-dev
-        libbz2-dev
-        libc6-dev
-        libc6-dev-i386
-        libcap-dev
-        libcap-ng-dev
-        libcryptsetup-dev
-        libcurl4-openssl-dev
-        libdbus-1-dev
-        libdw-dev
-        libfdisk-dev
-        libfido2-dev
-        libfuse-dev
-        libgcrypt20-dev
-        libglib2.0-dev
-        libgnutls28-dev
-        libidn2-dev
-        libiptc-dev
-        libkmod-dev
-        libmicrohttpd-dev
-        libmnl-dev
-        libmount-dev
-        libnuma-dev
-        libp11-kit-dev
-        libpam0g-dev
-        libpopt-dev
-        libpwquality-dev
-        libqrencode-dev
-        libseccomp-dev
-        libsmartcols-dev
-        libssl-dev
-        libxen-dev
-        libxkbcommon-dev
-        libzstd-dev
-        pahole
-        python3-docutils
-        python3-jinja2
-        python3-lxml
-        python3-pyelftools
-        xsltproc
diff --git a/mkosi.conf.d/20-fedora.conf b/mkosi.conf.d/20-fedora.conf
index 986d74a11a..1574420487 100644
--- a/mkosi.conf.d/20-fedora.conf
+++ b/mkosi.conf.d/20-fedora.conf
@@ -8,93 +8,17 @@ Release=38
 
 [Content]
 Packages=
-        alsa-lib
         btrfs-progs
         compsize
-        cryptsetup
-        dhcp-server
-        dnf
         f2fs-tools
-        fuse
-        glib2
-        glibc-minimal-langpack
-        gnutls
-        iproute
-        iproute-tc
-        kernel-core
-        libasan
-        libbpf
-        libcap-ng
-        libcap-ng-utils
-        libfido2
-        libgcrypt
-        libmicrohttpd
-        libmnl
-        libubsan
-        libxcrypt
-        libxkbcommon
-        netcat
-        numactl-libs
-        openssh-server
-        pam
-        passwd
-        polkit
-        popt
-        procps-ng
         python3dist(pefile)
         python3dist(psutil)
         python3dist(pytest)
-        quota
-        tpm2-tss
-        util-linux
-        vim-common
 
 BuildPackages=
-        bpftool
-        docbook-xsl
-        dwarves
-        glibc-static
         libcap-static
-        pam-devel
-        /usr/bin/pkg-config
-        pkgconfig(alsa)
-        pkgconfig(audit)
-        pkgconfig(blkid)
-        pkgconfig(dbus-1)
-        pkgconfig(fdisk)
-        pkgconfig(fuse)
-        pkgconfig(glib-2.0)
-        pkgconfig(libacl)
-        pkgconfig(libbpf)
-        pkgconfig(libcap-ng)
-        pkgconfig(libcap)
-        pkgconfig(libcryptsetup)
-        pkgconfig(libcurl)
-        pkgconfig(libdw)
-        pkgconfig(libfido2)
         pkgconfig(libgcrypt)
-        pkgconfig(libidn2)
-        pkgconfig(libkmod)
-        pkgconfig(libmicrohttpd)
-        pkgconfig(libmnl)
-        pkgconfig(libpcre2-8)
-        pkgconfig(libqrencode)
-        pkgconfig(libseccomp)
-        pkgconfig(libselinux)
-        pkgconfig(libzstd)
-        pkgconfig(mount)
-        pkgconfig(numa)
-        pkgconfig(openssl)
-        pkgconfig(p11-kit-1)
-        pkgconfig(popt)
-        pkgconfig(pwquality)
-        pkgconfig(tss2-esys)
-        pkgconfig(tss2-mu)
-        pkgconfig(tss2-rc)
-        pkgconfig(valgrind)
         pkgconfig(xencontrol)
-        pkgconfig(xkbcommon)
-        python3-docutils
         python3dist(jinja2)
         python3dist(lxml)
         python3dist(pyelftools)
diff --git a/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf
index 11c2721877..036c1734b2 100644
--- a/mkosi.conf.d/20-ubuntu.conf
+++ b/mkosi.conf.d/20-ubuntu.conf
@@ -9,94 +9,9 @@ Repositories=universe
 
 [Content]
 Packages=
-        btrfs-progs
-        cryptsetup-bin
-        dbus-broker
-        default-dbus-session-bus
-        f2fs-tools
-        fdisk
-        fuse
-        gcc # Provides libasan/libubsan
-        iproute2
-        isc-dhcp-server
-        libasound2
         libbpf0
-        libc6-i386
-        libcap-ng-utils
-        libcap-ng0
-        libfdisk1
-        libfido2-1
-        libglib2.0-0
-        libidn2-0
-        libmicrohttpd12
-        libmnl0
-        libnuma1
-        libp11-kit0
-        libpopt0
-        libpwquality1
-        libqrencode4
-        libtss2-dev # Use the -dev package to avoid churn in updating version numbers
-        linux-tools-common
-        linux-tools-generic
         linux-virtual
-        netcat-openbsd
-        openssh-server
-        passwd
-        policykit-1
-        procps
-        python3-pefile
-        python3-psutil
-        python3-pytest
-        quota
-        systemd-sysv
-        xxd
 
 BuildPackages=
-        docbook-xsl
-        dpkg-dev
-        g++
-        gcc-multilib
-        libacl1-dev
-        libasound-dev
-        libaudit-dev
-        libblkid-dev
-        libbpf-dev
-        libbz2-dev
-        libc6-dev
-        libc6-dev-i386
-        libcap-dev
-        libcap-ng-dev
-        libcryptsetup-dev
-        libcurl4-openssl-dev
-        libdbus-1-dev
-        libdw-dev
-        libfdisk-dev
-        libfido2-dev
-        libfuse-dev
-        libgcrypt20-dev
-        libglib2.0-dev
-        libgnutls28-dev
-        libidn2-dev
-        libiptc-dev
-        libkmod-dev
-        libmicrohttpd-dev
-        libmnl-dev
-        libmount-dev
-        libnuma-dev
-        libp11-kit-dev
-        libpam0g-dev
-        libpopt-dev
-        libpwquality-dev
-        libqrencode-dev
-        libseccomp-dev
-        libsmartcols-dev
-        libssl-dev
-        libxen-dev
-        libxkbcommon-dev
-        libzstd-dev
-        pahole
-        python3-docutils
-        python3-jinja2
-        python3-lxml
-        python3-pyelftools
-        xsltproc
+        linux-tools-common
+        linux-tools-generic