diff --git a/nixos/hosts/nixos-framework/disks.nix b/nixos/hosts/nixos-framework/disks.nix
index 3f4e531c..c3ed2668 100644
--- a/nixos/hosts/nixos-framework/disks.nix
+++ b/nixos/hosts/nixos-framework/disks.nix
@@ -1,15 +1,9 @@
 {
-
-  
   imports = [ ../../common/services/snapper.nix ];
   
   services.btrfs.autoScrub.enable = true;
   services.btrfs.autoScrub.interval = "weekly";
 
-  boot.resumeDevice = "/dev/disk/by-partlabel/ROOT";
-  # boot.kernelParams = [ "resume_offset=[offset]" ];
-  # https://sawyershepherd.org/post/hibernating-to-an-encrypted-swapfile-on-btrfs-with-nixos/ 
-
   disko.devices.disk.nvme0 = {
     device = "/dev/nvme0n1";
     content = {
@@ -38,6 +32,7 @@
           content = {
             type = "luks";
             name = "ROOT";
+            settings.preLVM = true;
             extraOpenArgs = [ "--allow-discards" ];
             content = {
               type = "btrfs";
@@ -68,15 +63,27 @@
                   mountpoint = "/nix/.snapshots";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
-                # Swap partition
-                "/swap" = {
-                  mountpoint = "/swap";
-                  swap.swapfile.size = "64G";
-                }; # swap
               }; # subvolumes
             }; # content.content
           }; # content
         } # partition 2 (/ BTRFS)
+        {
+          name = "LUKS-SWAP";
+          start = "-64GiB";
+          end = "100%";
+          content = {
+            type = "luks";
+            name = "SWAP";
+            settings = {
+              allowDiscards = true;
+              keyFile = "/mnt-root/etc/swap.key";
+            }; # content
+            content = {
+              type = "swap";
+              resumeDevice = true; # Hibernation
+            }; # content.ontent
+          };# content
+        } # partition 3 (SWAP)
       ]; # partitions
     }; # content
   }; # disko.devices.disk.nvme0