diff --git a/system/Northstar.nix b/system/Northstar.nix
index 003f39f5..4f7933c7 100644
--- a/system/Northstar.nix
+++ b/system/Northstar.nix
@@ -1,4 +1,8 @@
-{ ... }:
+{ username, ... }:
 {
   imports = [ ./laptop.nix ];
+  home-manager.users.${username} = {
+    home.stateVersion = "23.05";
+  };
+  system.stateVersion = "23.05";
 }
diff --git a/system/Ronin.nix b/system/Ronin.nix
index 882f11fb..75bb8ec5 100644
--- a/system/Ronin.nix
+++ b/system/Ronin.nix
@@ -3,6 +3,7 @@
   imports = [ ./laptop.nix ];
   home-manager.users.${username} = {
     imports = [ ./home/work.nix ];
+    home.stateVersion = "23.05";
   };
   boot.initrd = {
     secrets = {
@@ -13,6 +14,7 @@
       keyFile = "/crypto_keyfile.bin";
     };
   };
+  system.stateVersion = "23.05";
   environment = {
     etc."ppp/options".text = ''
       ipcp-accept-remote
diff --git a/system/Tone.nix b/system/Tone.nix
index 280eaca5..10b3558c 100644
--- a/system/Tone.nix
+++ b/system/Tone.nix
@@ -3,6 +3,7 @@
   imports = [ ./desktop.nix ];
   home-manager.users.${username} = {
     imports = [ ./home/work.nix ];
+    home.stateVersion = "23.05";
   };
   boot = {
     loader.efi.efiSysMountPoint = "/boot/efi";
@@ -16,6 +17,7 @@
       };
     };
   };
+  system.stateVersion = "23.05";
   environment = {
     etc."ppp/options".text = ''
       ipcp-accept-remote
diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index f4f9c73a..8e4e1270 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -8,22 +8,25 @@
   imports = [ ./desktop.nix ];
   environment.sessionVariables.MANGOHUD = 1;
   home-manager.users.${username} = {
-    home.packages = with pkgs; [
-      krita
-      kdenlive
-      helvum
-      prusa-slicer
-      blender
-      freecad
-      openscad
-      kicad-small
-      mangohud
-      wineWowPackages.waylandFull
-      winetricks
-      lutris
-      cartridges
-      prismlauncher
-    ];
+    home = {
+      stateVersion = "23.05";
+      packages = with pkgs; [
+        krita
+        kdenlive
+        helvum
+        prusa-slicer
+        blender
+        freecad
+        openscad
+        kicad-small
+        mangohud
+        wineWowPackages.waylandFull
+        winetricks
+        lutris
+        cartridges
+        prismlauncher
+      ];
+    };
     programs.obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [
@@ -69,6 +72,7 @@
     };
     steam-hardware.enable = true;
   };
+  system.stateVersion = "23.05";
   programs = {
     gamemode.enable = true;
     steam = {
diff --git a/system/default.nix b/system/default.nix
index b067b1b8..a86af8ca 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -80,22 +80,19 @@
       })
     ];
   };
-  system = {
-    stateVersion = "23.05";
-    autoUpgrade = {
-      enable = true;
-      persistent = true;
-      allowReboot = false;
-      flake = "git+${config.nix.registry.my-nixos.to.url}";
-      dates = "02:00";
-      randomizedDelaySec = "5min";
-      flags = [
-        "--accept-flake-config"
-        "--option"
-        "extra-binary-caches"
-        "https://nix.xenia.me.uk"
-      ];
-    };
+  system.autoUpgrade = {
+    enable = true;
+    persistent = true;
+    allowReboot = false;
+    flake = "git+${config.nix.registry.my-nixos.to.url}";
+    dates = "02:00";
+    randomizedDelaySec = "5min";
+    flags = [
+      "--accept-flake-config"
+      "--option"
+      "extra-binary-caches"
+      "https://nix.xenia.me.uk"
+    ];
   };
   systemd.services = lib.mkIf config.system.autoUpgrade.enable {
     nixos-upgrade.serviceConfig = {
@@ -152,7 +149,6 @@
       imports = [ ./home/default.nix ];
       home = {
         inherit username;
-        stateVersion = "23.05";
         homeDirectory = "/home/${username}";
       };
     };