diff --git a/modules/darwin/base/nix/default.nix b/modules/darwin/base/nix/default.nix
index 48d3a997..d0cdd825 100644
--- a/modules/darwin/base/nix/default.nix
+++ b/modules/darwin/base/nix/default.nix
@@ -4,6 +4,7 @@
   nix = {
     configureBuildUsers = true;
     gc.interval = if config.chvp.base.nix.slowGc then { Hour = 0; Minute = 0; } else { Minute = 0; };
+    optimise.interval = { Minute = 30; };
     settings.sandbox = true;
   };
   nixpkgs.flake = {
diff --git a/modules/nixos/base/nix/default.nix b/modules/nixos/base/nix/default.nix
index fe0e2dff..1a599eee 100644
--- a/modules/nixos/base/nix/default.nix
+++ b/modules/nixos/base/nix/default.nix
@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 {
   nix.gc.dates = if config.chvp.base.nix.slowGc then "daily" else "hourly";
+  nix.optimise.dates = [ "hourly" ];
   programs.command-not-found.enable = false;
 }
diff --git a/modules/shared/base/nix/default.nix b/modules/shared/base/nix/default.nix
index ca1c833e..e3f76949 100644
--- a/modules/shared/base/nix/default.nix
+++ b/modules/shared/base/nix/default.nix
@@ -60,8 +60,8 @@ in
         automatic = true;
         options = "--delete-older-than 7d";
       };
+      optimise.automatic = true;
       settings = {
-        auto-optimise-store = true;
         substituters = [
           "https://cache.nixos.org"
           "https://accentor.cachix.org"