diff --git a/dragonwell/default.nix b/dragonwell/default.nix
index 81ea24da74aab68dcf401e4fadb5cfab723fbd98..090548bbae0299c464f27a16a06c9bffed0f5a34 100644
--- a/dragonwell/default.nix
+++ b/dragonwell/default.nix
@@ -57,13 +57,5 @@     };
     "root".openssh.authorizedKeys.keys = [ key ];
   };
 
-  nix = {
-    gc = {
-      automatic = true;
-      randomizedDelaySec = "15m";
-    };
-    optimise.automatic = true;
-  };
-
   system.stateVersion = "22.11";
 }
diff --git a/gunpowder/default.nix b/gunpowder/default.nix
index ef70ac02f632e38dbdd9ec733db6097aaf9648c6..ae0bfcc6fdfda769b06a23ae1092b24ff122d39d 100644
--- a/gunpowder/default.nix
+++ b/gunpowder/default.nix
@@ -130,14 +130,6 @@       "sonarr"
     ];
   };
 
-  nix = {
-    gc = {
-      automatic = true;
-      randomizedDelaySec = "15m";
-    };
-    optimise.automatic = true;
-  };
-
   environment.systemPackages = with pkgs; [ qbittorrent ];
 
   system.stateVersion = "22.11";
diff --git a/jasmine/default.nix b/jasmine/default.nix
index 4ac889af964edd33de50aea0844184ba6a31ea35..19f1db904da764c8200ca3898988b114dcf0b049 100644
--- a/jasmine/default.nix
+++ b/jasmine/default.nix
@@ -71,11 +71,7 @@   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    gc = {
-      automatic = true;
-      randomizedDelaySec = "15m";
-    };
-    optimise.automatic = true;
+    gc.automatic = true;
     settings = {
       trusted-users = [
         "@sudo"
@@ -86,6 +82,7 @@       experimental-features = [
         "flakes"
         "nix-command"
       ];
+      auto-optimise-store = true;
     };
   };
 
diff --git a/shincha/default.nix b/shincha/default.nix
index 3803d44daa505644407452167719b4857c04f55d..139321e03fe4372aed7f54f87d0e0572aa17b73b 100644
--- a/shincha/default.nix
+++ b/shincha/default.nix
@@ -69,11 +69,7 @@   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    gc = {
-      automatic = true;
-      randomizedDelaySec = "15m";
-    };
-    optimise.automatic = true;
+    gc.automatic = true;
     settings = {
       trusted-users = [
         "@sudo"
@@ -84,6 +80,7 @@       experimental-features = [
         "flakes"
         "nix-command"
       ];
+      auto-optimise-store = true;
     };
   };