diff --git a/machines/web01/disko.nix b/machines/web01/disko.nix
index 573f790..61f07f9 100644
--- a/machines/web01/disko.nix
+++ b/machines/web01/disko.nix
@@ -14,23 +14,21 @@ in
         device = "/dev/vdb";
         type = "disk";
         content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "ESP";
+          type = "gpt";
+          partitions = {
+            ESP = {
               start = "1MiB";
+              label = "ESP";
               end = "512MiB";
-              fs-type = "fat32";
-              bootable = true;
+              type = "EF00";
+              priority = 1;
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
               };
-            }
-            {
-              name = "luks";
+            };
+            luks = {
               start = "512MiB";
               end = "-4GiB";
               content = rec {
@@ -38,7 +36,7 @@ in
                 name = luksName;
                 extraOpenArgs = [ "--keyfile-size=1" ];
                 extraFormatArgs = extraOpenArgs;
-                keyFile = "/dev/zero";
+                settings.keyFile = "/dev/zero";
                 content = {
                   type = "btrfs";
                   mountpoint = "/mnt/btrfs-root";
@@ -65,17 +63,18 @@ in
                   };
                 };
               };
-            }
-            {
-              name = "swap";
+            };
+            swap = {
+              label = "swap";
               start = "-4GiB";
               end = "100%";
+              priority = 3;
               content = {
                 type = "swap";
                 randomEncryption = true;
               };
-            }
-          ];
+            };
+          };
         };
       };
     };