diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf
index 957eacbbb6..06692c7393 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf
@@ -1,9 +1,17 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
+# The systemd-tpm package pulls the libs it needs from deb14/ubuntu26.10
 
-[Match]
-Distribution=|debian
-Distribution=|kali
-Distribution=|ubuntu
+[TriggerMatch]
+Distribution=debian
+Release=|bullseye
+Release=|bookworm
+Release=|trixie
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=|jammy
+Release=|noble
+Release=|resolute
 
 [Content]
 Packages=
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf
similarity index 58%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf
rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf
index ccfd8d4ce9..7af235fe9e 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm.conf
@@ -6,5 +6,14 @@ Release=!bullseye
 Release=!bookworm
 Release=!trixie
 
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+Release=!resolute
+
+[TriggerMatch]
+Distribution=kali
+
 [Content]
 Packages=systemd-tpm
diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/network/mkosi.conf.d/systemd-imds.conf b/mkosi/resources/mkosi-initrd/mkosi.profiles/network/mkosi.conf.d/systemd-imds.conf
new file mode 100644
index 0000000000..ea2823f3a2
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.profiles/network/mkosi.conf.d/systemd-imds.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=!bullseye
+Release=!bookworm
+Release=!trixie
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+Release=!resolute
+
+[TriggerMatch]
+Distribution=kali
+
+[Content]
+Packages=systemd-imds
diff --git a/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm-imds-report.conf b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm-imds-report.conf
new file mode 100644
index 0000000000..f2ff3f06ec
--- /dev/null
+++ b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-tpm-imds-report.conf
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=!bullseye
+Release=!bookworm
+Release=!trixie
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+Release=!resolute
+
+[TriggerMatch]
+Distribution=kali
+
+[Content]
+Packages=
+        systemd-imds
+        systemd-report
+        systemd-tpm