diff --git a/Makefile b/Makefile
index 6dbb248c9..6ffb94fff 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ EMBED_TARGET ?= embed
 TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
 TOOLS ?= v1.11.0-alpha.0-1-ge35234b
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.11.0-alpha.0-20-g0f74b9b
+PKGS ?= v1.11.0-alpha.0-23-g1b1430e
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
 CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
diff --git a/hack/cleanup.sh b/hack/cleanup.sh
index c8e636f8c..f0c9e7b2b 100755
--- a/hack/cleanup.sh
+++ b/hack/cleanup.sh
@@ -1,20 +1,6 @@
 #!/bin/bash
 PREFIX="${1}"
 
-function remove_symlinks() {
-    set +e
-    for l in $(find ${PREFIX} -type l); do
-        readlink $l | grep -q /toolchain
-        if [ $? == 0 ]; then
-            unlink $l
-        fi
-    done
-    set -e
-}
-
-# Remove any symlinks that might have been need at build time.
-remove_symlinks
-
 # Remove any archives as we do not need them since everything is dynamically linked.
 find ${PREFIX} -type f -name \*.a -delete
 find ${PREFIX} -type f -name \*.la -delete
@@ -33,6 +19,5 @@ rm -rf ${PREFIX}/usr/lib/pkgconfig/ \
        ${PREFIX}/usr/libexec/getconf \
        ${PREFIX}/var/db
 
-# Remove contents of /usr/bin except for udevadm
-# TODO: do not install these files in the first place.
-# find ${PREFIX}/usr/bin \( -type f -o -type l \) ! -name udevadm -delete
+# Drop broken symlinks.
+find ${PREFIX} -xtype l -print -delete
diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs
index 4f92861f7..d16508c9d 100644
--- a/pkg/machinery/gendata/data/pkgs
+++ b/pkg/machinery/gendata/data/pkgs
@@ -1 +1 @@
-v1.11.0-alpha.0-20-g0f74b9b
\ No newline at end of file
+v1.11.0-alpha.0-23-g1b1430e
\ No newline at end of file
diff --git a/pkg/makefs/xfs_test.go b/pkg/makefs/xfs_test.go
index 28920d922..3579a4e58 100644
--- a/pkg/makefs/xfs_test.go
+++ b/pkg/makefs/xfs_test.go
@@ -104,7 +104,7 @@ realtime =none                   extsz=4096   blocks=0, rtextents=0
 
 			var stdout bytes.Buffer
 
-			cmd := exec.Command("xfs_info", tempFile)
+			cmd := exec.Command("xfs_db", "-p", "xfs_info", "-c", "info", tempFile)
 			cmd.Stdout = &stdout
 			require.NoError(t, cmd.Run())