diff --git a/modules/servers/general/default.nix b/modules/servers/general/default.nix
index 7645c87..081b2f4 100644
--- a/modules/servers/general/default.nix
+++ b/modules/servers/general/default.nix
@@ -8,5 +8,6 @@
     ./additional-pkgs.nix
     ./root.nix
     ./beszel-agent.nix
+    ./optimise-storage.nix
   ];
 }
diff --git a/modules/servers/general/optimise-storage.nix b/modules/servers/general/optimise-storage.nix
new file mode 100644
index 0000000..95abd05
--- /dev/null
+++ b/modules/servers/general/optimise-storage.nix
@@ -0,0 +1,19 @@
+{...}: {
+  nix.optimise = {
+    automatic = true;
+    dates = "weekly";
+  };
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 10d";
+  };
+
+  nix.extraOptions = ''
+    min-free = ${toString (100 * 1024 * 1024)}
+    max-free = ${toString (1024 * 1024 * 1024)}
+  '';
+
+  boot.loader.grub.configurationLimit = 3;
+}