diff --git a/systems/gateway/hardware.nix b/systems/gateway/hardware.nix
index 03d1945..30dc479 100644
--- a/systems/gateway/hardware.nix
+++ b/systems/gateway/hardware.nix
@@ -6,16 +6,11 @@
     [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
   boot.initrd.kernelModules = [ "nvme" ];
 
-  boot.loader.grub.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" = {
+  fileSystems."/boot/efi" = {
     device = "/dev/sda2";
     fsType = "vfat";
     options = [ "defaults" ];