diff --git a/hosts/gaming/default.nix b/hosts/gaming/default.nix
index 13b603f..bc8c4ce 100644
--- a/hosts/gaming/default.nix
+++ b/hosts/gaming/default.nix
@@ -5,6 +5,7 @@
     ../../modules/base.nix
     ../../modules/japanese.nix
     ../../modules/gc.nix
+    ../../modules/upgrade.nix
     ../../modules/steam.nix
     ../../modules/guitar.nix
   ];
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 4c99ac2..e50618a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -7,6 +7,7 @@
     ../../modules/niri.nix
     ../../modules/japanese.nix
     ../../modules/gc.nix
+    ../../modules/upgrade.nix
   ];
 
   networking.hostName = "laptop";
diff --git a/hosts/minipc/default.nix b/hosts/minipc/default.nix
index d881d7f..ed02c9b 100644
--- a/hosts/minipc/default.nix
+++ b/hosts/minipc/default.nix
@@ -6,6 +6,7 @@
     ../../modules/dev
     ../../modules/niri.nix
     ../../modules/gc.nix
+    ../../modules/upgrade.nix
     ../../modules/japanese.nix
   ];
 
diff --git a/modules/gc.nix b/modules/gc.nix
index 0d564dc..e783414 100644
--- a/modules/gc.nix
+++ b/modules/gc.nix
@@ -1,18 +1,5 @@
 { config, inputs, ... }:
 {
-  system.autoUpgrade = {
-    enable = true;
-    flake = inputs.self.outPath;
-    flags = [
-      "--update-input" "nixpkgs"
-      "--no-write-lock-file"
-      "--print-build-logs"
-    ];
-    dates = "02:00";
-    randomizedDelaySec = "45min";
-    persistent = true;
-  };
-
   nix.gc = {
     automatic = true;
     dates = "weekly";
diff --git a/modules/upgrade.nix b/modules/upgrade.nix
new file mode 100644
index 0000000..c8e6936
--- /dev/null
+++ b/modules/upgrade.nix
@@ -0,0 +1,13 @@
+{ inputs, ... }: {
+  system.autoUpgrade = {
+    enable = true;
+    flake = inputs.self.outPath;
+    flags = [
+      "--update-input" "nixpkgs"
+      "--no-write-lock-file"
+      "--print-build-logs"
+    ];
+    dates = "weekly";
+    persistent = true;
+  };
+}