diff --git a/framework/framework/configuration.nix b/framework/framework/configuration.nix
index aee2028..e80989f 100644
--- a/framework/framework/configuration.nix
+++ b/framework/framework/configuration.nix
@@ -31,7 +31,7 @@ in
       options = [ "defaults" "size=4G" "mode=755" ];
     };
     "/persist" = {
-      device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+      device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       neededForBoot = true;
     };
diff --git a/framework/framework/disko-btrfs.nix b/framework/framework/disko-btrfs.nix
index f940cf5..1efb00a 100644
--- a/framework/framework/disko-btrfs.nix
+++ b/framework/framework/disko-btrfs.nix
@@ -68,10 +68,6 @@
 		      mountpoint = "/nix";
 		      mountOptions = [ "compress=zstd" "noatime" "ssd" "space_cache=v2" ];
 		    };
-		    "/swap" = {
-		      mountpoint = "/swap";
-		      swap.swapfile.size = "70G";
-		    };
 		  };
                 };
               };
diff --git a/framework/framework/hardware-configuration-tmpfs.nix b/framework/framework/hardware-configuration-tmpfs.nix
index 9e01c10..dadb542 100644
--- a/framework/framework/hardware-configuration-tmpfs.nix
+++ b/framework/framework/hardware-configuration-tmpfs.nix
@@ -19,51 +19,45 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C86C-8A59";
+    { device = "/dev/disk/by-uuid/963D-7FF2";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+    { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/196ffcae-d171-482c-8b90-dda60c0d4f86";
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/3e59f9f8-065f-4778-a08e-dc361fc8c3a5";
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+    { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       options = [ "subvol=nix" ];
     };
 
   fileSystems."/persist" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+    { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       options = [ "subvol=persist" ];
     };
 
-  fileSystems."/swap" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
-      fsType = "btrfs";
-      options = [ "subvol=swap" ];
-    };
-
   fileSystems."/var/lib" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+    { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       options = [ "subvol=var/lib" ];
     };
 
   fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/7bdece95-b369-4d57-b405-70338fd9cd54";
+    { device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
       fsType = "btrfs";
       options = [ "subvol=var/log" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/0137a60e-9a7c-4682-9bb8-9c05f996b9af"; }
+    [ { device = "/dev/disk/by-uuid/05e71820-86a3-44d2-86e5-14738b3283b4"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking