diff --git a/system/Legion.nix b/system/Legion.nix
index e56683b1..0a3c2c44 100644
--- a/system/Legion.nix
+++ b/system/Legion.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ username, ... }:
 {
   imports = [
     ./services/adguardhome.nix
@@ -17,6 +17,13 @@
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
   };
+  home-manager.users.${username} = {
+    home.stateVersion = "23.05";
+  };
+  system = {
+    stateVersion = "23.05";
+    autoUpgrade.operation = "switch";
+  };
   users.mutableUsers = false;
   hardware.bluetooth.enable = true;
 }
diff --git a/system/default.nix b/system/default.nix
index a86af8ca..d8766d39 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -29,7 +29,6 @@
         "flakes"
       ];
       auto-optimise-store = true;
-      download-buffer-size = "2G";
       substituters = [ "https://nix.xenia.me.uk" ];
       trusted-public-keys = [ "nix.xenia.me.uk:tlgwOaG5KMLjQUk2YaErS8mAG69ZCr3PaHXZYi+Y5eI=" ];
     };
@@ -82,13 +81,14 @@
   };
   system.autoUpgrade = {
     enable = true;
+    operation = lib.mkDefault "boot";
     persistent = true;
     allowReboot = false;
     flake = "git+${config.nix.registry.my-nixos.to.url}";
     dates = "02:00";
     randomizedDelaySec = "5min";
+    fixedRandomDelay = true;
     flags = [
-      "--accept-flake-config"
       "--option"
       "extra-binary-caches"
       "https://nix.xenia.me.uk"