diff --git a/mkosi.extra/etc/systemd/logind.conf.d/disable-wall.conf b/mkosi.extra/etc/systemd/logind.conf.d/disable-wall.conf
new file mode 100644
index 0000000..cd36552
--- /dev/null
+++ b/mkosi.extra/etc/systemd/logind.conf.d/disable-wall.conf
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2026 Vishal Rao <vishalrao@gmail.com>
+
+[Login]
+WallMessages=no
diff --git a/mkosi.extra/usr/lib/initcpio/install/sd-shutdown b/mkosi.extra/usr/lib/initcpio/install/sd-shutdown
new file mode 100644
index 0000000..21b1b4a
--- /dev/null
+++ b/mkosi.extra/usr/lib/initcpio/install/sd-shutdown
@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2025-2026 Vishal Rao <vishalrao@gmail.com>
+
+build() {
+    map add_binary \
+        /usr/lib/libblkid.so \
+        /usr/lib/libmount.so
+}
diff --git a/mkosi.extra/usr/lib/rebuild-efi b/mkosi.extra/usr/lib/rebuild-efi
index 842c794..563fdb2 100755
--- a/mkosi.extra/usr/lib/rebuild-efi
+++ b/mkosi.extra/usr/lib/rebuild-efi
@@ -30,7 +30,7 @@ cat <<- EOF > mkinitcpio.conf
 MODULES=(overlay)
 BINARIES=()
 FILES=()
-HOOKS=(base systemd modconf kms keyboard block sd-encrypt filesystems fsck systemd-extension plymouth microcode)
+HOOKS=(base systemd modconf kms keyboard block sd-encrypt filesystems fsck systemd-extension plymouth microcode sd-shutdown)
 EOF
 
 echo "rw \