diff --git a/system/Legion.nix b/system/Legion.nix
index 87bde085..b913d25d 100644
--- a/system/Legion.nix
+++ b/system/Legion.nix
@@ -21,16 +21,13 @@
   system = {
     stateVersion = "23.05";
     autoUpgrade = {
-      enable = true;
-      persistent = true;
-      allowReboot = false;
-      flake = "git+https://git.xenia.me.uk/pixelifytica/nixos.git?ref=main";
-      dates = "02:00";
-      flags = [
-        "--option"
-        "extra-binary-caches"
-        "https://nix.xenia.me.uk"
-      ];
+      operation = "switch";
+      randomizedDelaySec = "0";
+      allowReboot = true;
+      rebootWindow = {
+        lower = "01:00";
+        upper = "05:00";
+      };
     };
   };
   users.mutableUsers = false;
diff --git a/system/default.nix b/system/default.nix
index 7be6b125..7d2b4032 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -49,6 +49,21 @@
       "steamcmd"
       "nomachine-client"
     ];
+  system.autoUpgrade = {
+    enable = lib.mkDefault true;
+    persistent = true;
+    allowReboot = false;
+    flake = "git+https://git.xenia.me.uk/pixelifytica/nixos.git?ref=main";
+    operation = lib.mkDefault "boot";
+    dates = "daily";
+    randomizedDelaySec = lib.mkDefault "45min";
+    fixedRandomDelay = true;
+    flags = [
+      "--option"
+      "extra-binary-caches"
+      "https://nix.xenia.me.uk"
+    ];
+  };
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
diff --git a/system/laptop.nix b/system/laptop.nix
index 69a1ced6..512b1693 100644
--- a/system/laptop.nix
+++ b/system/laptop.nix
@@ -4,6 +4,7 @@
 }:
 {
   imports = [ ./desktop.nix ];
+  system.autoUpgrade.enable = false;
   environment.systemPackages = [ pkgs.acpi ];
   powerManagement.enable = true;
   networking.networkmanager.wifi.powersave = true;