diff --git a/machines/gamepc/configuration.nix b/machines/gamepc/configuration.nix
index e6fc959..6c960de 100644
--- a/machines/gamepc/configuration.nix
+++ b/machines/gamepc/configuration.nix
@@ -5,30 +5,14 @@
     };
 
     facter.reportPath = ./facter.json;
-
     networking.hostName = "gamepc";
-
-    # boot = {
-    #   loader = {
-    #     systemd-boot.enable = true;
-    #     efi.canTouchEfiVariables = true;
-    #   };
-    # };
+    users.users.pim.password = "";
+    users.users.root.password = "";
 
     boot.loader.grub = {
       enable = true;
       efiSupport = true;
       efiInstallAsRemovable = true;
-      mirroredBoots = [
-        {
-          path = "/boot0";
-          devices = ["nodev"];
-        }
-        {
-          path = "/boot1";
-          devices = ["nodev"];
-        }
-      ];
     };
 
     disko.devices.disk = lib.genAttrs ["0" "1"] (name: {
@@ -37,14 +21,16 @@
       content = {
         type = "gpt";
         partitions = {
+          boot = {
+            size = "1M";
+            type = "EF02"; # for grub MBR
+          };
           ESP = {
-            type = "EF00";
             size = "500M";
+            type = "EF00";
             content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot${name}";
-              mountOptions = ["umask=0077"];
+              type = "mdraid";
+              name = "boot";
             };
           };
           mdadm = {
@@ -59,16 +45,16 @@
     });
 
     disko.devices.mdadm = {
-      # boot = {
-      #   type = "mdadm";
-      #   level = 1;
-      #   metadata = "1.0";
-      #   content = {
-      #     type = "filesystem";
-      #     format = "vfat";
-      #     mountpoint = "/boot";
-      #   };
-      # };
+      boot = {
+        type = "mdadm";
+        level = 1;
+        metadata = "1.0";
+        content = {
+          type = "filesystem";
+          format = "vfat";
+          mountpoint = "/boot";
+        };
+      };
       raid0 = {
         type = "mdadm";
         level = 0;
diff --git a/nixos/default.nix b/nixos/default.nix
index d976ccb..dffc5c9 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -43,11 +43,9 @@
     };
   };
 
-  users = {
-    users.pim = {
-      isNormalUser = true;
-      extraGroups = ["wheel" "docker" "input" "wireshark" "dialout"];
-    };
+  users.users.pim = {
+    isNormalUser = true;
+    extraGroups = ["wheel" "docker" "input" "wireshark" "dialout"];
   };
 
   environment = {