diff --git a/disko/luks-btrfs-subvolumes.nix b/disko/luks-btrfs-subvolumes.nix
index ac3e12d..47e529f 100644
--- a/disko/luks-btrfs-subvolumes.nix
+++ b/disko/luks-btrfs-subvolumes.nix
@@ -1,7 +1,7 @@
 let
   installDisk = "sda";
   bootPartitionSize = "512M";
-  swapfileSize = "34G";
+  swapfileSize = "10G";
 in {
   disko.devices = {
     disk = {
@@ -11,6 +11,10 @@ in {
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02"; # for grub MBR
+            };
             ESP = {
               size = bootPartitionSize;
               type = "EF00";
@@ -27,31 +31,30 @@ in {
               size = "100%";
               content = {
                 type = "luks";
-                name = "crypted";
+                name = "cryptroot";
                 settings.allowDiscards = true;
-                # passwordFile = "/tmp/secret.key"; # Interactive
                 content = {
                   type = "btrfs";
                   extraArgs = [ "-f" ];
                   subvolumes = {
-                    "/root" = {
+                    "@" = {
                       mountpoint = "/";
                       mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
                     };
-                    "/home" = {
+                    "@home" = {
                       mountpoint = "/home";
                       mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
                     };
-                    "/.snapshots" = {
+                    "@.snapshots" = {
                       mountpoint = "/.snapshots";
                       mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
                     };
-                    "/nix" = {
+                    "@nix" = {
                       mountpoint = "/nix";
                       mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
                     };
-                    "/swap" = {
-                      mountpoint = "/.swapvol";
+                    "@swap" = {
+                      mountpoint = "/swap";
                       swap.swapfile.size = swapfileSize;
                     };
                   };
diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index 1ad16ae..aaabcac 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -32,16 +32,14 @@
   boot = {
     initrd.enable = true;
     loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
+      systemd-boot.enable = false;
+      efi.canTouchEfiVariables = false;
       grub = {
         enable = true;
-        device = "nodev";
         efiSupport = true;
         enableCryptodisk = true;
         useOSProber = true;
+        efiInstallAsRemovable = true;
       };
     };
   };