diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 9010b1fcb7..b9ccd02c3a 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-    - uses: systemd/mkosi@e59f763872e4d5f96acb11b4a77995b986bb31cc
+    - uses: systemd/mkosi@8fde39857993c2120bcc6e480dab9fbb47dc2a7e
 
     - name: Configure
       run: |
diff --git a/mkosi.conf.d/05-qemu-mem.conf b/mkosi.conf.d/05-qemu-mem.conf
index 58de5fcf56..7dd02925c0 100644
--- a/mkosi.conf.d/05-qemu-mem.conf
+++ b/mkosi.conf.d/05-qemu-mem.conf
@@ -4,8 +4,8 @@
 # them without OOMing.
 
 [Match]
-Distribution=arch centos
-Release=rolling 8
+Distribution=|arch
+Distribution=|centos
 
 [Host]
 QemuMem=3G
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
index ad44d46529..283369ff10 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora
 
 [Content]
 Packages=
diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
index 1c4cb2d7ac..63b1daae0a 100644
--- a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu
 
 [Content]
 Packages=
diff --git a/mkosi.presets/10-initrd/mkosi.conf b/mkosi.presets/10-initrd/mkosi.conf
index 40fd6c4005..77e4896c17 100644
--- a/mkosi.presets/10-initrd/mkosi.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Bootable=auto,yes
+Bootable=|auto
+Bootable=|yes
 
 [Output]
 Format=cpio
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
index a2a9352266..58e48989f3 100644
--- a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=arch debian fedora opensuse ubuntu
+Distribution=!centos
 
 [Output]
 CompressOutput=zst
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
index 02e11d095f..f22aed3700 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora
 
 [Content]
 Packages=
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
index 071e46fd44..588f833c8f 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu
 
 [Content]
 Packages=
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
index b11b13f709..14b18727ef 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
@@ -2,7 +2,8 @@
 
 [Match]
 PathExists=../../mkosi.kernel/
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora
 
 [Content]
 Packages=
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
index 653efa8f0c..f9413f1da6 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
@@ -2,7 +2,8 @@
 
 [Match]
 PathExists=../../mkosi.kernel/
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu
 
 [Content]
 Packages=