diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index 06e3ab6..6faff7b 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -156,12 +156,6 @@
     ];
   };
 
-  # Optimise storage
-  nix.optimise = {
-    automatic = true;
-    dates = ["weekly"];
-  };
-
   # Enable my flake specific settings
   crony.nvidia.enable = true;
   crony.gaming.enable = true;
diff --git a/modules/linux/nixos/nh.nix b/modules/linux/nixos/nh.nix
index e5c17b1..b865f5a 100644
--- a/modules/linux/nixos/nh.nix
+++ b/modules/linux/nixos/nh.nix
@@ -14,7 +14,7 @@
       flake = "/home/crony/repos/nixos";
       clean = {
         enable = true;
-        extraArgs = "--keep 5 --keep-since 3d";
+        extraArgs = "--keep 20 --keep-since 1w --optimise";
         dates = "daily";
       };
     };