diff --git a/devices/disko/vds.nix b/devices/disko/vds.nix
index 4260e59..6288274 100644
--- a/devices/disko/vds.nix
+++ b/devices/disko/vds.nix
@@ -7,21 +7,20 @@
         content = {
           type = "gpt";
           partitions = {
-            ESP = {
+            boot = {
               type = "EF02";
-              size = "512M";
+              size = "1M";
+            };
+            ESP = {
+              size = "500M";
+              type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
               };
             };
-            #             swap = {
-            #               size = "2G";
-            #               content = {
-            #                 type = "swap";
-            #               };
-            #             };
             root = {
               size = "100%";
               content = {
@@ -30,6 +29,12 @@
                 mountpoint = "/";
               };
             };
+            swap = {
+              size = "2G";
+              content = {
+                type = "swap";
+              };
+            };
           };
         };
       };
diff --git a/devices/hardware/vds.nix b/devices/hardware/vds.nix
index c8500be..e303ba9 100755
--- a/devices/hardware/vds.nix
+++ b/devices/hardware/vds.nix
@@ -34,11 +34,11 @@
 
   fileSystems = {
     "/" = {
-      device = lib.mkForce "/dev/vda2"; # "/dev/disk/by-partlabel/disk-main-root";
+      device = lib.mkForce "/dev/disk/by-partlabel/disk-main-root"; # "/dev/disk/by-partlabel/disk-main-root";
       fsType = "ext4";
     };
     "/boot" = {
-      device = lib.mkForce "/dev/vda1";
+      device = lib.mkForce "/dev/disk/by-partlabel/disk-main-ESP";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
diff --git a/devices/vds.nix b/devices/vds.nix
index 98cd7c9..ba7375c 100755
--- a/devices/vds.nix
+++ b/devices/vds.nix
@@ -44,7 +44,7 @@ let
         loader = {
           grub = {
             enable = true;
-            device = "/dev/vda1";
+            device = "nodev";
             useOSProber = false;
             efiSupport = false;
             #efiInstallAsRemovable = true;