diff --git a/systems/gateway/default.nix b/systems/gateway/default.nix
index 19c0b24..c679b3d 100644
--- a/systems/gateway/default.nix
+++ b/systems/gateway/default.nix
@@ -1,15 +1,5 @@
 { config, lib, inputs, ... }: {
   imports = [ ./hardware.nix ];
-  
-  boot.loader.systemd-boot.enable = lib.mkForce true;
-  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
-  boot.loader.grub = {
-    enable = true;
-    # device = "nodev";              # Required for EFI#
-    efiSupport = true;
-    efiInstallAsRemovable = true;# CRITICAL: This overwrites /boot/EFI/BOOT/BOOTX64.EFI
-  };
-
 
   services.openssh.enable = true;
   services.openssh.authorizedKeysFiles = [
diff --git a/systems/gateway/hardware.nix b/systems/gateway/hardware.nix
index 0729381..507f77b 100644
--- a/systems/gateway/hardware.nix
+++ b/systems/gateway/hardware.nix
@@ -1,7 +1,16 @@
 { config, lib, pkgs, modulesPath, ... }: {
   boot.kernelPackages = pkgs.linuxPackages_latest;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  boot.loader.grub.device = "/dev/sda";
+
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    efiSupport = true;
+    efiInstallAsRemovable = true;# CRITICAL: This overwrites /boot/EFI/BOOT/BOOTX64.EFI
+  };
+
   boot.initrd.availableKernelModules =
     [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
   boot.initrd.kernelModules = [ "nvme" ];