diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 8732279..3d11ab7 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -397,6 +397,10 @@ in
       # Lock after 15 minutes of idle
       { timeout = 15 * 60; command = cfg.lockCmd; }
     ];
+    events = [
+      { event = "lock"; command = cfg.lockCmd; }
+      { event = "before-sleep"; command = cfg.lockCmd; }
+    ];
   };
 
   config.programs.waybar =
diff --git a/nki-framework/configuration.nix b/nki-framework/configuration.nix
index 9c6231b..75c4aca 100644
--- a/nki-framework/configuration.nix
+++ b/nki-framework/configuration.nix
@@ -20,7 +20,7 @@
   # Power Management
   services.upower = {
     enable = true;
-    criticalPowerAction = "PowerOff";
+    criticalPowerAction = "Hibernate";
 
     usePercentageForPolicy = true;
     percentageCritical = 3;
diff --git a/nki-framework/hardware-configuration.nix b/nki-framework/hardware-configuration.nix
index a80a9f9..500765a 100644
--- a/nki-framework/hardware-configuration.nix
+++ b/nki-framework/hardware-configuration.nix
@@ -16,6 +16,9 @@
   boot.kernelParams = [
     # See https://community.frame.work/t/tracking-graphical-corruption-in-fedora-39-amd-3-03-bios/39073/143
     "amdgpu.sg_display=0"
+    # Hibernation
+    "resume=UUID=fa8aaf51-b99f-4fb4-9230-8c0957d8af3f"
+    "resume_offset=5776640" # btrfs inspect-internal map-swapfile -r /var/swapfile
   ];
 
   fileSystems."/" =