diff --git a/modules/nixos/system/hw/boot/default.nix b/modules/nixos/system/hw/boot/default.nix
index a049fb0..5f96f95 100644
--- a/modules/nixos/system/hw/boot/default.nix
+++ b/modules/nixos/system/hw/boot/default.nix
@@ -9,7 +9,7 @@ in {
       };
       efi = {
         canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
+        efiSysMountPoint = "/boot";
       };
     };
   };
diff --git a/systems/gateway/hardware.nix b/systems/gateway/hardware.nix
index 30dc479..0729381 100644
--- a/systems/gateway/hardware.nix
+++ b/systems/gateway/hardware.nix
@@ -10,7 +10,7 @@
     device = "/dev/sda3";
     fsType = "btrfs";
   };
-  fileSystems."/boot/efi" = {
+  fileSystems."/boot" = {
     device = "/dev/sda2";
     fsType = "vfat";
     options = [ "defaults" ];
diff --git a/systems/iriy/hardware.nix b/systems/iriy/hardware.nix
index ca051f9..26fa7af 100755
--- a/systems/iriy/hardware.nix
+++ b/systems/iriy/hardware.nix
@@ -24,7 +24,7 @@
     fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" = {
+  fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/349E-5086";
     fsType = "vfat";
   };
diff --git a/systems/valinor/hardware.nix b/systems/valinor/hardware.nix
index 217f348..c7a04d5 100755
--- a/systems/valinor/hardware.nix
+++ b/systems/valinor/hardware.nix
@@ -17,7 +17,7 @@
     fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" = {
+  fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/F344-72E2";
     fsType = "vfat";
   };