diff --git a/hosts/srv01.hf/default.nix b/hosts/srv01.hf/default.nix
index 868a71b..a7a3540 100644
--- a/hosts/srv01.hf/default.nix
+++ b/hosts/srv01.hf/default.nix
@@ -17,13 +17,6 @@
       ./hardware-configuration.nix
     ];
 
-  boot = {
-    loader.grub = {
-      enable = true;
-      device = "/dev/sda";
-    };
-    tmp.useTmpfs = true;
-  };
 
   networking.hostName = "srv01-hf"; # Define your hostname.
 
diff --git a/modules/disko/efi-full-btrfs.nix b/modules/disko/efi-full-btrfs.nix
index 5dcb78c..59e8b26 100644
--- a/modules/disko/efi-full-btrfs.nix
+++ b/modules/disko/efi-full-btrfs.nix
@@ -7,16 +7,21 @@
         content = {
           type = "gpt";
           partitions = {
+            MBR = {
+              type = "EF02"; # for grub MBR
+              size = "1M";
+              priority = 1; # Needs to be first partition
+            };
             ESP = {
               priority = 1;
               name = "ESP";
-              start = "1M";
-              end = "128M";
+              size = "500M";
               type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
               };
             };
             root = {