diff --git a/base.nix b/base.nix
index a6df078..c76f0bf 100644
--- a/base.nix
+++ b/base.nix
@@ -171,8 +171,8 @@
   users.mutableUsers = false; # Force all user management to happen throught nix-files
 
   boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+    systemd-boot.enable = pkgs.lib.mkDefault true;
+    efi.canTouchEfiVariables = pkgs.lib.mkDefault true;
     timeout = pkgs.lib.mkDefault 0;
   };
 }
diff --git a/machine-confs/wg-rpi.nix b/machine-confs/wg-rpi.nix
index 5f69eda..0ef3e8d 100644
--- a/machine-confs/wg-rpi.nix
+++ b/machine-confs/wg-rpi.nix
@@ -108,6 +108,8 @@ in
       "usb_storage"
     ];
     loader = {
+      timeout = 5;
+      systemd-boot.enable = false;
       grub.enable = false;
       generic-extlinux-compatible.enable = true;
     };