diff --git a/hosts/i15.nix b/hosts/i15.nix
index 31a2f7f..e6f0e75 100644
--- a/hosts/i15.nix
+++ b/hosts/i15.nix
@@ -3,7 +3,7 @@
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 let
-  btrfs_options = [ "compress=zstd:3" "noatime" ];
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
diff --git a/hosts/monolith.nix b/hosts/monolith.nix
index 03fe339..21e42ca 100644
--- a/hosts/monolith.nix
+++ b/hosts/monolith.nix
@@ -3,7 +3,7 @@
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 let
-  btrfs_options = [ "compress=zstd:3" "noatime" ];
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
   btrfs_ssd = [ "ssd" "discard=async" ];
 in
 {
diff --git a/hosts/rainbow.nix b/hosts/rainbow.nix
index 5479e30..776ebec 100644
--- a/hosts/rainbow.nix
+++ b/hosts/rainbow.nix
@@ -3,7 +3,7 @@
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 let
-  btrfs_options = [ "compress=zstd:3" "noatime" ];
+  btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ];
   btrfs_ssd = [ "ssd" "discard=async" ];
 in
 {
diff --git a/system/boot.nix b/system/boot.nix
index 7a2fd82..453ccd9 100644
--- a/system/boot.nix
+++ b/system/boot.nix
@@ -19,6 +19,7 @@
 
       # Disable password timeout
       "luks.options=timeout=0"
+      "rd.luks.options=timeout=0"
       "rootflags=x-systemd.device-timeout=0"
     ];