diff --git a/base.nix b/base.nix
index 3688b27..b752cc9 100644
--- a/base.nix
+++ b/base.nix
@@ -121,7 +121,7 @@
   swapDevices = [
     {
       device = "/var/lib/swapfile";
-      size = 16 * 1024;
+      size = 8 * 1024;
     }
   ];
 
diff --git a/machine-confs/helium.nix b/machine-confs/helium.nix
index 64d7f67..bab3eb5 100644
--- a/machine-confs/helium.nix
+++ b/machine-confs/helium.nix
@@ -74,6 +74,13 @@
     ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-0 --auto --pos 0x0 --primary --output eDP --auto --pos 3840x360
   '';
 
+  swapDevices = pkgs.lib.mkForce [
+    {
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+
   boot = {
     resumeDevice = "/dev/mapper/luks-f6e1979b-0dee-4ee9-8170-10490019854b";
     kernelParams = [ "resume_offset=44537856" ];
diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix
index 70ff34c..7ade65b 100644
--- a/machine-confs/lithium.nix
+++ b/machine-confs/lithium.nix
@@ -11,6 +11,13 @@
     ../hardware-specific/usb-automount.nix
   ];
 
+  swapDevices = pkgs.lib.mkForce [
+    {
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+
   boot = {
     #resumeDevice = "/dev/mapper/luks-f6e1979b-0dee-4ee9-8170-10490019854b";
     #kernelParams = [ "resume_offset=44537856" ];
diff --git a/machine-confs/wg-rpi.nix b/machine-confs/wg-rpi.nix
index c59c6e5..214bb1b 100644
--- a/machine-confs/wg-rpi.nix
+++ b/machine-confs/wg-rpi.nix
@@ -100,13 +100,6 @@ in
     max-jobs = 2;
   };
 
-  swapDevices = pkgs.lib.mkForce [
-    {
-      device = "/var/lib/swapfile";
-      size = 8 * 1024;
-    }
-  ];
-
   boot = {
     kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
     initrd.availableKernelModules = [