diff --git a/server/disk-config.nix b/server/disk-config.nix
index 1cc08e80..c4e68413 100644
--- a/server/disk-config.nix
+++ b/server/disk-config.nix
@@ -7,12 +7,16 @@
         content = {
           type = "gpt";
           partitions = {
-            boot = {
+            ESP = {
+              priority = 1;
+              name = "ESP";
               size = "1G";
               type = "EF00";
               content = {
-                type = "mdraid";
-                name = "boot";
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = ["umask=0077"];
               };
             };
             primary = {
@@ -31,14 +35,14 @@
         content = {
           type = "gpt";
           partitions = {
-            boot = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "mdraid";
-                name = "boot";
-              };
-            };
+            # esp = {
+            #   size = "1G";
+            #   type = "EF00";
+            #   content = {
+            #     type = "mdraid";
+            #     name = "boot";
+            #   };
+            # };
             primary = {
               size = "100%";
               content = {
@@ -50,18 +54,18 @@
         };
       };
     };
-    mdadm = {
-      boot = {
-        type = "mdadm";
-        level = 1;
-        metadata = "1.0";
-        content = {
-          type = "filesystem";
-          format = "vfat";
-          mountpoint = "/boot";
-        };
-      };
-    };
+    # mdadm = {
+    #   esp = {
+    #     type = "mdadm";
+    #     level = 1;
+    #     metadata = "1.0";
+    #     content = {
+    #       type = "filesystem";
+    #       format = "vfat";
+    #       mountpoint = "/boot";
+    #     };
+    #   };
+    # };
     lvm_vg = {
       pool = {
         type = "lvm_vg";