diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
index 69d1c22975..0de00d82ac 100644
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -27,6 +27,8 @@ Packages=
         cryptsetup
         device-mapper-event
         device-mapper-multipath
+        dfuzzer
+        erofs-utils
         git-core
         glibc-langpack-de
         glibc-langpack-en
@@ -38,6 +40,7 @@ Packages=
         iputils
         iscsi-initiator-utils
         kernel-core
+        knot
         libcap-ng-utils
         man-db
         nmap-ncat
@@ -52,6 +55,7 @@ Packages=
         python3-pexpect
         # needed to upgrade and downgrade systemd-ukify in tests
         python3-zstd
+        qrencode
         quota
         rpm
         softhsm
diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf
new file mode 100644
index 0000000000..90b7668f55
--- /dev/null
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=uefi
+
+[Content]
+Packages=
+        sbsigntools
+
+VolatilePackages=
+        systemd-boot
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf
index 2961ee316b..ea0a34b4fd 100644
--- a/mkosi/mkosi.conf.d/centos/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos/mkosi.conf
@@ -5,6 +5,7 @@ Distribution=centos
 
 [Distribution]
 Release=10
+Repositories=epel,epel-next
 
 [Build]
 Environment=
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
deleted file mode 100644
index 9e92a4f226..0000000000
--- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=9
-
-[Distribution]
-Repositories=
-        epel
-        epel-next
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf
deleted file mode 100644
index edefbe7977..0000000000
--- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Repositories=epel
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
-
-[Content]
-Packages=
-        sbsigntools
-
-VolatilePackages=
-        systemd-boot
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
deleted file mode 100644
index 6bcc663e59..0000000000
--- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Repositories=epel
-
-[Content]
-Packages=
-        dfuzzer
-        dhcp-server
-        erofs-utils
-        knot
-        qrencode
diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
index b6422af16a..9252d4b20e 100644
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
@@ -4,13 +4,7 @@
 Environment=WITH_DEBUG=1
 
 [Match]
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
+Architecture=uefi
 
 [Content]
 VolatilePackages=
diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
index c808ddd9cf..3836792ad1 100644
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
@@ -2,13 +2,7 @@
 # sbsigntool exists only on UEFI architectures
 
 [Match]
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
+Architecture=uefi
 
 [Content]
 Packages=
diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf
index b954d2802a..e2a479eb6d 100644
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf
@@ -10,15 +10,11 @@ Release=rawhide
 Packages=
         btrfs-progs
         compsize
-        dfuzzer
         dhcp-server
         dnf5
-        erofs-utils
         f2fs-tools
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
-        knot
-        qrencode
         rpmautospec
         scsi-target-utils
diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf
deleted file mode 100644
index 44de850ee0..0000000000
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=fedora
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
-
-[Content]
-Packages=
-        sbsigntools
-
-VolatilePackages=
-        systemd-boot
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
index b63e00be5e..9ef1833a88 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
@@ -4,13 +4,7 @@
 Environment=WITH_DEBUG=1
 
 [Match]
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
+Architecture=uefi
 
 [Content]
 VolatilePackages=
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
index 7ee6b4eaf7..7cb650a44e 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
@@ -1,14 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=opensuse
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
+Architecture=uefi
 
 [Content]
 VolatilePackages=