diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index e011c14623..c83be9c78d 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -109,6 +109,17 @@ jobs:
             no_qemu: 0
             no_kvm: 0
             shim: 0
+          - distro: ubuntu
+            release: resolute
+            runner: ubuntu-24.04
+            sanitizers: ""
+            llvm: 0
+            cflags: "-Og"
+            relabel: no
+            vm: 0
+            no_qemu: 0
+            no_kvm: 0
+            shim: 0
           - distro: fedora
             release: "43"
             runner: ubuntu-24.04
diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf
index 8bbf964664..3b726d840e 100644
--- a/mkosi/mkosi.conf
+++ b/mkosi/mkosi.conf
@@ -90,7 +90,6 @@ Packages=
         attr
         bash-completion
         binutils
-        coreutils
         cpio
         curl
         diffutils
diff --git a/mkosi/mkosi.conf.d/arch/mkosi.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf
index 9bea621fca..73001894c2 100644
--- a/mkosi/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi/mkosi.conf.d/arch/mkosi.conf
@@ -17,6 +17,7 @@ Packages=
         bind
         bpf
         btrfs-progs
+        coreutils
         cryptsetup
         dbus-broker
         dbus-broker-units
diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
index 416e71ba32..739b2d94eb 100644
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -23,6 +23,7 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
+        coreutils
         cryptsetup
         device-mapper-event
         device-mapper-multipath
diff --git a/mkosi/mkosi.conf.d/debian/mkosi.conf b/mkosi/mkosi.conf.d/debian/mkosi.conf
index c960a1b2ec..f0ecec311a 100644
--- a/mkosi/mkosi.conf.d/debian/mkosi.conf
+++ b/mkosi/mkosi.conf.d/debian/mkosi.conf
@@ -8,4 +8,5 @@ Release=testing
 
 [Content]
 Packages=
+        coreutils
         linux-perf
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
index d01c6658c0..295ed53c58 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
@@ -35,6 +35,7 @@ Packages=
         bind-utils
         bpftool
         btrfs-progs
+        coreutils
         cryptsetup
         device-mapper
         dhcp-server
diff --git a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
new file mode 100644
index 0000000000..86d4d1132b
--- /dev/null
+++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
diff --git a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
new file mode 100644
index 0000000000..b680604f00
--- /dev/null
+++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils
diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf
new file mode 100644
index 0000000000..df2010cee4
--- /dev/null
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# bpftool was untangled in resolute
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=bpftool
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf
index 8e57cd032d..60c6b4cc71 100644
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf
@@ -15,7 +15,6 @@ CleanPackageMetadata=yes
 
 Packages=
         bash
-        coreutils
         grep
         socat
         util-linux
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
index 6d77d2305d..ce62ded294 100644
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
@@ -6,6 +6,7 @@ Distribution=arch
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
+        coreutils
         inetutils
         iproute
         nmap
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
index 53cc68d794..ac951fbf60 100644
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
@@ -7,6 +7,7 @@ Distribution=|fedora
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
+        coreutils
         hostname
         iproute
         iproute-tc
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian.conf
new file mode 100644
index 0000000000..eed9f5d6d7
--- /dev/null
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        coreutils
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
index 8b38a769a1..ebf55a3188 100644
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
@@ -6,6 +6,7 @@ Distribution=opensuse
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
+        coreutils
         diffutils
         grep
         hostname
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf
new file mode 100644
index 0000000000..b9fd7bcf34
--- /dev/null
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
new file mode 100644
index 0000000000..86d4d1132b
--- /dev/null
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
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
new file mode 100644
index 0000000000..b680604f00
--- /dev/null
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf b/mkosi/mkosi.initrd.conf/mkosi.conf
index 207b15f98c..de37e7c3c9 100644
--- a/mkosi/mkosi.initrd.conf/mkosi.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf
@@ -12,7 +12,6 @@ Environment=SYSTEMD_REQUIRED_DEPS_ONLY=1
 ExtraTrees=%D/mkosi/mkosi.extra.common
 
 Packages=
-        coreutils
         findutils
         grep
         sed
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf
index 909426a09c..7204318402 100644
--- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf
@@ -7,6 +7,7 @@ Distribution=arch
 PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
         btrfs-progs
+        coreutils
         tpm2-tools
 
 VolatilePackages=
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf
index a35ccb4a0e..2077f0662f 100644
--- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf
@@ -7,6 +7,7 @@ Distribution=|fedora
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
+        coreutils
         swtpm-tools
         tpm2-tools
 
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/debian.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/debian.conf
new file mode 100644
index 0000000000..eed9f5d6d7
--- /dev/null
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/debian.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        coreutils
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf
index 9308395763..92fc255670 100644
--- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf
@@ -7,6 +7,7 @@ Distribution=opensuse
 PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
         btrfs-progs
+        coreutils
         kmod
         tpm2.0-tools
 
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf
new file mode 100644
index 0000000000..b9fd7bcf34
--- /dev/null
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
new file mode 100644
index 0000000000..86d4d1132b
--- /dev/null
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils-gnu.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
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
new file mode 100644
index 0000000000..b680604f00
--- /dev/null
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils
diff --git a/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build b/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
index a7eac125e3..e4b2f8be84 100644
--- a/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
+++ b/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
@@ -17,6 +17,6 @@ integration_tests += [
                                 'StopWhenUnneeded' : 'yes',
                         },
                 },
-                'coredump-exclude-regex' : '/(bash|sleep)$',
+                'coredump-exclude-regex' : '/(bash|coreutils|gnusleep|sleep)$',
         },
 ]
diff --git a/test/integration-tests/TEST-17-UDEV/meson.build b/test/integration-tests/TEST-17-UDEV/meson.build
index 58f809ba29..6a3ae8ee07 100644
--- a/test/integration-tests/TEST-17-UDEV/meson.build
+++ b/test/integration-tests/TEST-17-UDEV/meson.build
@@ -4,6 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'vm' : true,
-                'coredump-exclude-regex' : '/(coreutils|sleep|udevadm)$',
+                'coredump-exclude-regex' : '/(coreutils|gnusleep|sleep|udevadm)$',
         },
 ]
diff --git a/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build b/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
index f5fae753e2..be275a81fc 100644
--- a/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
+++ b/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
@@ -3,6 +3,6 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
-                'coredump-exclude-regex' : '/(coreutils|sleep|bash|systemd-notify)$',
+                'coredump-exclude-regex' : '/(coreutils|gnusleep|sleep|bash|systemd-notify)$',
         },
 ]
diff --git a/test/units/TEST-50-DISSECT.dissect.sh b/test/units/TEST-50-DISSECT.dissect.sh
index d82f8c40fd..8cc07df3b9 100755
--- a/test/units/TEST-50-DISSECT.dissect.sh
+++ b/test/units/TEST-50-DISSECT.dissect.sh
@@ -25,9 +25,9 @@ systemd-dissect "$MINIMAL_IMAGE.raw" | grep -F -f <(sed 's/"//g' "$OS_RELEASE")
 
 systemd-dissect --list "$MINIMAL_IMAGE.raw" | grep '^etc/os-release$' >/dev/null
 systemd-dissect --mtree "$MINIMAL_IMAGE.raw" --mtree-hash yes | \
-    grep -E "^.(/usr|)/bin/cat type=file mode=0755 uid=0 gid=0 size=[0-9]* sha256sum=[a-z0-9]*$" >/dev/null
+    grep -E "^.(/usr|)/bin/bash type=file mode=0755 uid=0 gid=0 size=[0-9]* sha256sum=[a-z0-9]*$" >/dev/null
 systemd-dissect --mtree "$MINIMAL_IMAGE.raw" --mtree-hash no  | \
-    grep -E "^.(/usr|)/bin/cat type=file mode=0755 uid=0 gid=0 size=[0-9]*$" >/dev/null
+    grep -E "^.(/usr|)/bin/bash type=file mode=0755 uid=0 gid=0 size=[0-9]*$" >/dev/null
 
 read -r SHA256SUM1 _ < <(systemd-dissect --copy-from "$MINIMAL_IMAGE.raw" etc/os-release | sha256sum)
 test "$SHA256SUM1" != ""