diff --git a/systems/gateway/hardware.nix b/systems/gateway/hardware.nix
index 20d3bb5..03d1945 100644
--- a/systems/gateway/hardware.nix
+++ b/systems/gateway/hardware.nix
@@ -7,10 +7,17 @@
   boot.initrd.kernelModules = [ "nvme" ];
 
   boot.loader.grub.enable = lib.mkForce false;
-  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.systemd-boot.enable = true;
+  # boot.loader.efi.efiSysMountPoint = "/boot";  # Changed from /boot/efi
+  # boot.loader.efi.canTouchEfiVariables = true;
 
   fileSystems."/" = {
     device = "/dev/sda3";
     fsType = "btrfs";
   };
+  fileSystems."/boot" = {
+    device = "/dev/sda2";
+    fsType = "vfat";
+    options = [ "defaults" ];
+  };
 }