diff --git a/nixos/boxes/colony/default.nix b/nixos/boxes/colony/default.nix
index a839cb8..7dfdd7f 100644
--- a/nixos/boxes/colony/default.nix
+++ b/nixos/boxes/colony/default.nix
@@ -37,7 +37,7 @@
         boot.loader.systemd-boot.configurationLimit = 20;
         fileSystems = {
           "/boot" = {
-            device = "/dev/disk/by-label/ESP";
+            device = "/dev/disk/by-uuid/83CA-3BCF";
             fsType = "vfat";
           };
           "/nix" = {
@@ -59,6 +59,7 @@
 
         environment.systemPackages = with pkgs; [
           pciutils
+          partclone
         ];
 
         systemd = {
diff --git a/nixos/boxes/colony/vms/default.nix b/nixos/boxes/colony/vms/default.nix
index e427322..61fc632 100644
--- a/nixos/boxes/colony/vms/default.nix
+++ b/nixos/boxes/colony/vms/default.nix
@@ -38,22 +38,12 @@
               waitOnline = "no-carrier";
               mac = "52:54:00:ab:f1:52";
             };
-            drives = {
-              # TODO: Split into separate LVs
-              disk = mkIf (!config.my.build.isDevVM) {
-                backend = {
-                  driver = "host_device";
-                  filename = "/dev/ssds/vm-estuary";
-                  # It appears this needs to be set on the backend _and_ the format
-                  discard = "unmap";
-                };
-                format = {
-                  driver = "raw";
-                  discard = "unmap";
-                };
-                frontend = "virtio-blk";
-              };
-            };
+            drives = mkMerge ([ ] ++ (optionals (!config.my.build.isDevVM) [
+              (vmLVM "estuary" "esp")
+              (vmLVM "estuary" "nix")
+              (vmLVM "estuary" "persist")
+              { esp.frontendOpts.bootindex = 0; }
+            ]));
             hostDevices."${wanBDF}" = { };
           };
           shill = {
diff --git a/nixos/boxes/colony/vms/estuary/default.nix b/nixos/boxes/colony/vms/estuary/default.nix
index 258e611..ccfc9ea 100644
--- a/nixos/boxes/colony/vms/estuary/default.nix
+++ b/nixos/boxes/colony/vms/estuary/default.nix
@@ -45,11 +45,11 @@
                 fsType = "vfat";
               };
               "/nix" = {
-                device = "/dev/main/nix";
+                device = "/dev/disk/by-label/nix";
                 fsType = "ext4";
               };
               "/persist" = {
-                device = "/dev/main/persist";
+                device = "/dev/disk/by-label/persist";
                 fsType = "ext4";
                 neededForBoot = true;
               };
diff --git a/nixos/boxes/colony/vms/shill/default.nix b/nixos/boxes/colony/vms/shill/default.nix
index 373dfa5..cf82a7e 100644
--- a/nixos/boxes/colony/vms/shill/default.nix
+++ b/nixos/boxes/colony/vms/shill/default.nix
@@ -43,11 +43,11 @@
                 fsType = "vfat";
               };
               "/nix" = {
-                device = "/dev/vdb";
+                device = "/dev/disk/by-label/nix";
                 fsType = "ext4";
               };
               "/persist" = {
-                device = "/dev/vdc";
+                device = "/dev/disk/by-label/persist";
                 fsType = "ext4";
                 neededForBoot = true;
               };