diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index 5444a8f8d..4025d81db 100644
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1252,7 +1252,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `archlinux-keyring`     | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    |          |
     | `attr`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `bash`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `btrfs-progs`           | ✓      |        | ✓      | ✓    | ✓      | ✓    | ✓        |
+    | `btrfs-progs`           | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `ca-certificates`       | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `coreutils`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `cpio`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
@@ -1260,15 +1260,15 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `curl`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `debian-keyring`        | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    |          |
     | `diffutils`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `distribution-gpg-keys` | ✓      | ✓      |        |      |        | ✓    | ✓        |
+    | `distribution-gpg-keys` | ✓      | ✓      | ✓      | ✓    |        | ✓    | ✓        |
     | `dnf`                   | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `dnf-plugins-core`      | ✓      | ✓      |        |      |        |      | ✓        |
-    | `dnf5`                  | ✓      |        |        |      |        |      |          |
-    | `dnf5-plugins`          | ✓      |        |        |      |        |      |          |
+    | `dnf5`                  | ✓      |        |        |      |        |      | ✓        |
+    | `dnf5-plugins`          | ✓      |        |        |      |        |      | ✓        |
     | `dosfstools`            | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `e2fsprogs`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `edk2-ovmf`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `erofs-utils`           | ✓      |        | ✓      | ✓    | ✓      | ✓    | ✓        |
+    | `erofs-utils`           | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `findutils`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `git`                   | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `grep`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
@@ -1282,7 +1282,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `opensc`                | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `openssh`               | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `openssl`               | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `pkcs11-provider`       | ✓      |        | ✓      | ✓    | ✓      | ✓    | ✓        |
+    | `pkcs11-provider`       | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `perf`                  | ✓      | ✓      | ✓      | ✓    |        | ✓    | ✓        |
     | `sed`                   | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `pacman`                | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    |          |
@@ -1299,11 +1299,11 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `ubuntu-keyring`        | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    |          |
     | `util-linux`            | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `virtiofsd`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `virt-firmware`         | ✓      | ✓      |        |      |        | ✓    |          |
+    | `virt-firmware`         | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `xfsprogs`              | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `xz`                    | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `zstd`                  | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `zypper`                | ✓      |        | ✓      | ✓    | ✓      | ✓    |          |
+    | `zypper`                | ✓      |        | ✓      | ✓    | ✓      |      | ✓         |
 
 `ToolsTreeDistribution=`, `--tools-tree-distribution=`
 :   Set the distribution to use for the default tools tree. Defaults to the host distribution except for
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf
similarity index 58%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf
index 5b4a0aae0..ef3ab6db5 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=kali
+Release=10
 
 [Content]
-Packages=
-        linux-perf
+Packages=pkcs11-provider
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
similarity index 52%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
index 50dfa11db..3aaddca3a 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=debian
+Distribution=|debian
+Distribution=|kali
 
 [Content]
-Packages=
-        linux-perf
+Packages=linux-perf
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf
new file mode 100644
index 000000000..82519a849
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=!bookworm
+Release=!bullseye
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+
+[TriggerMatch]
+Distribution=kali
+
+[Content]
+Packages=
+        python3-virt-firmware
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
index b5a37e29a..ac61f1ca6 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
@@ -40,6 +40,7 @@ Packages=
         systemd-experimental
         systemd-journal-remote
         tpm2.0-tools
+        virt-firmware
         virtiofsd
         xz
         zypper