diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index 1c8789e..4eafc11 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -45,7 +45,6 @@
           size = "20G";
           content = {
             type = "swap";
-            discardPolicy = "both";
             resumeDevice = true;
           };
         };
diff --git a/hosts/desktop/hardware.nix b/hosts/desktop/hardware.nix
index 4e4df2f..a69b7d9 100644
--- a/hosts/desktop/hardware.nix
+++ b/hosts/desktop/hardware.nix
@@ -20,10 +20,6 @@ _: {
       "usbhid"
       "sd_mod"
     ];
-    kernelParams = [
-      "zswap.enabled=1"
-      "zswap.shrinker_enabled=1"
-    ];
   };
 
   # Prevent immediate wake-up from suspend caused by the logi bolt receiver
diff --git a/hosts/laptop/disko.nix b/hosts/laptop/disko.nix
index 7dbe535..4a0923f 100644
--- a/hosts/laptop/disko.nix
+++ b/hosts/laptop/disko.nix
@@ -42,7 +42,6 @@
           size = "20G";
           content = {
             type = "swap";
-            discardPolicy = "both";
             resumeDevice = true;
           };
         };
diff --git a/hosts/laptop/hardware.nix b/hosts/laptop/hardware.nix
index e38b8ca..f3153a5 100644
--- a/hosts/laptop/hardware.nix
+++ b/hosts/laptop/hardware.nix
@@ -18,10 +18,6 @@
       "usb_storage"
       "sd_mod"
     ];
-    kernelParams = [
-      "zswap.enabled=1"
-      "zswap.shrinker_enabled=1"
-    ];
   };
 
   services = {
diff --git a/hosts/srv-core/disko.nix b/hosts/srv-core/disko.nix
index 8cd022a..b1c4d38 100644
--- a/hosts/srv-core/disko.nix
+++ b/hosts/srv-core/disko.nix
@@ -16,10 +16,7 @@
           partitions = {
             swap = {
               size = "8G";
-              content = {
-                type = "swap";
-                discardPolicy = "both";
-              };
+              content.type = "swap";
             };
             root = {
               size = "100%";
diff --git a/hosts/srv-core/hardware.nix b/hosts/srv-core/hardware.nix
index 888a405..ac0e37c 100644
--- a/hosts/srv-core/hardware.nix
+++ b/hosts/srv-core/hardware.nix
@@ -10,10 +10,6 @@ _: {
       "sd_mod"
       "sdhci_pci"
     ];
-    kernelParams = [
-      "zswap.enabled=1"
-      "zswap.shrinker_enabled=1"
-    ];
 
     supportedFilesystems = [ "bcachefs" ];
 
diff --git a/hosts/vps-ns/hardware.nix b/hosts/vps-ns/hardware.nix
index ea58368..073f92f 100644
--- a/hosts/vps-ns/hardware.nix
+++ b/hosts/vps-ns/hardware.nix
@@ -12,6 +12,4 @@
     "sd_mod"
     "sr_mod"
   ];
-
-  zramSwap.enable = true;
 }
diff --git a/hosts/vps-www/hardware.nix b/hosts/vps-www/hardware.nix
index ea58368..073f92f 100644
--- a/hosts/vps-www/hardware.nix
+++ b/hosts/vps-www/hardware.nix
@@ -12,6 +12,4 @@
     "sd_mod"
     "sr_mod"
   ];
-
-  zramSwap.enable = true;
 }
diff --git a/modules/nixos/services/bluetooth.nix b/modules/nixos/services/bluetooth.nix
index aa9d0ae..31d4f36 100644
--- a/modules/nixos/services/bluetooth.nix
+++ b/modules/nixos/services/bluetooth.nix
@@ -6,7 +6,7 @@
     hardware = {
       bluetooth = {
         enable = true;
-        powerOnBoot = false;
+        powerOnBoot = true;
       };
       logitech.wireless.enable = true;
     };
diff --git a/profiles/core.nix b/profiles/core.nix
index c2913bc..53f02d1 100644
--- a/profiles/core.nix
+++ b/profiles/core.nix
@@ -93,6 +93,8 @@
     vimAlias = true;
   };
 
+  zramSwap.enable = true;
+
   environment.systemPackages = [
     (lib.hiPrio pkgs.uutils-coreutils-noprefix)
     pkgs.git