diff --git a/devices/ellaca/disko.nix b/devices/ellaca/disko.nix
index 482ed8d..b1b6a39 100644
--- a/devices/ellaca/disko.nix
+++ b/devices/ellaca/disko.nix
@@ -1,7 +1,7 @@
 {
   disko.devices = {
     disk = {
-      vdb = {
+      vda = {
         type = "disk";
         device = "/dev/nvme0n1";
         content = {
@@ -39,15 +39,6 @@
                     mountOptions = [ "compress=zstd" "noatime" ];
                     mountpoint = "/nix";
                   };
-                  # Subvolume for the swapfile
-                  "/swap" = {
-                    mountpoint = "/.swapvol";
-                    swap = {
-                      swapfile.size = "20M";
-                      swapfile2.size = "20M";
-                      swapfile2.path = "rel-path";
-                    };
-                  };
                 };
                 swap = {
                   swapfile = {
@@ -59,6 +50,29 @@
           };
         };
       };
+      vdb = {
+        type = "disk";
+        device = "/dev/sda";
+        content = {
+          type = "gpt";
+          partitions = {
+            root = {
+              size = "100%";
+              content = {
+                type = "btrfs";
+                extraArgs = [ "-f" ]; # Override existing partition
+                # Subvolumes must set a mountpoint in order to be mounted,
+                # unless their parent is mounted
+                subvolumes = {
+                  "/ext" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountpoint = "/ext";
+                  };
+              };
+            };
+          };
+        };
+      };
     };
   };
 }