diff --git a/machines/storage/s0/configuration.nix b/machines/storage/s0/configuration.nix
index e1989e7..bd47cc2 100644
--- a/machines/storage/s0/configuration.nix
+++ b/machines/storage/s0/configuration.nix
@@ -12,12 +12,9 @@
 
   networking.hostName = "s0";
 
-  luks = {
-    enable = true;
-    device = {
-      path = "/dev/disk/by-uuid/96b216e1-071b-4c02-899e-29e2eeced7a8";
-      allowDiscards = true;
-    };
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/96b216e1-071b-4c02-899e-29e2eeced7a8";
+    allowDiscards = true;
   };
 
   boot.loader.grub.enable = false;
diff --git a/machines/storage/s0/hardware-configuration.nix b/machines/storage/s0/hardware-configuration.nix
index bc4df43..df35130 100644
--- a/machines/storage/s0/hardware-configuration.nix
+++ b/machines/storage/s0/hardware-configuration.nix
@@ -31,7 +31,7 @@
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/c7156f71-68f3-4f7a-bec0-06bdfa63f6c0"; }
+    [ { device = "/dev/mapper/vg-swap"; }
     ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";