diff --git a/install/config/all.sh b/install/config/all.sh
index a9affb79..eeb9810b 100644
--- a/install/config/all.sh
+++ b/install/config/all.sh
@@ -14,6 +14,7 @@ run_logged $OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh
 run_logged $OMARCHY_INSTALL/config/docker.sh
 run_logged $OMARCHY_INSTALL/config/mimetypes.sh
 run_logged $OMARCHY_INSTALL/config/localdb.sh
+run_logged $OMARCHY_INSTALL/config/fast-shutdown.sh
 run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 run_logged $OMARCHY_INSTALL/config/hardware/network.sh
 run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
diff --git a/install/config/fast-shutdown.sh b/install/config/fast-shutdown.sh
new file mode 100755
index 00000000..bbbfafdc
--- /dev/null
+++ b/install/config/fast-shutdown.sh
@@ -0,0 +1,7 @@
+sudo mkdir -p /etc/systemd/system.conf.d
+
+cat <<EOF | sudo tee /etc/systemd/system.conf.d/10-faster-shutdown.conf
+[Manager]
+DefaultTimeoutStopSec=5s
+EOF
+sudo systemctl daemon-reload
diff --git a/migrations/1758564460_enable_fast_shutdown.sh b/migrations/1758564460_enable_fast_shutdown.sh
new file mode 100644
index 00000000..f0b10693
--- /dev/null
+++ b/migrations/1758564460_enable_fast_shutdown.sh
@@ -0,0 +1,2 @@
+echo "Enable fast shutdown"
+source $OMARCHY_PATH/install/config/fast-shutdown.sh