diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 6aa59f6d09..3edcff25f5 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
-      - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+      - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 003122950a..d44ad6c746 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -40,7 +40,7 @@ jobs:
           GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml
           ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false
 
-      - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+      - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 
       - name: Check that tabs are not used in Python code
         run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 7d50bb13aa..f831536ba8 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -169,7 +169,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
-      - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+      - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index d265c993c7..085a4b091a 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -74,7 +74,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+      - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 
       - name: Install apk
         # ubuntu-24.04 doesn't package apk, so fetch the official statically-linked binary from
diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf
index bff2efbdee..2216ada89d 100644
--- a/mkosi/mkosi.conf
+++ b/mkosi/mkosi.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+MinimumVersion=commit:60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 Dependencies=
         minimal-base
         minimal-0
diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf
index 2977041fd9..d22865feae 100644
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf
@@ -2,15 +2,15 @@
 
 [TriggerMatch]
 Distribution=debian
-Release=bullseye
-Release=bookworm
-Release=trixie
+Release=|bullseye
+Release=|bookworm
+Release=|trixie
 
 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
-Release=questing
+Release=|jammy
+Release=|noble
+Release=|questing
 
 [Content]
 Packages=isc-dhcp-server
diff --git a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
index b680604f00..7cc69182a1 100644
--- a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@
 
 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble
 
 [Content]
 Packages=
diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf
new file mode 100644
index 0000000000..b777a41490
--- /dev/null
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# bpftool was untangled in resolute, needs linux-tools-generic in older releases
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=|jammy
+Release=|noble
+
+[Content]
+Packages=linux-tools-generic
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
index b680604f00..7cc69182a1 100644
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@
 
 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble
 
 [Content]
 Packages=
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
index b680604f00..7cc69182a1 100644
--- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@
 
 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble
 
 [Content]
 Packages=
diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf
index 73bcf958d6..1a86f7c7c6 100644
--- a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf
@@ -9,5 +9,5 @@ Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
         GIT_BRANCH=debian/master
-        GIT_COMMIT=3e1930512d1efee7e11b619a5f493b3229594a51
+        GIT_COMMIT=cde07547abb088a20acd28593e6d0ee25d403b63
         PKG_SUBDIR=debian