diff --git a/systems/gateway/default.nix b/systems/gateway/default.nix
index a479c6b..a8eb1e8 100644
--- a/systems/gateway/default.nix
+++ b/systems/gateway/default.nix
@@ -1,6 +1,15 @@
 { config, inputs, ... }: {
   imports = [ ./hardware.nix ];
   
+  boot.loader.systemd-boot.enable = lib.mkForce true;
+  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 = [
     config.sops.secrets."iriy_ssh_pub".path