diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index 7ae7f632..4f22ac89 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -1,4 +1,4 @@
-{
+{ forEachUser, ... }: {
   imports = [
     ../configuration.nix
     ../raspberry-pi.nix
@@ -54,4 +54,8 @@
 
   networking.hostName = "biskcomp";
   system.stateVersion = "23.11";
+
+  home-manager.users = forEachUser {
+    home.stateVersion = "23.11";
+  };
 }
diff --git a/nixos/machines/jay-lenovo-wsl.nix b/nixos/machines/jay-lenovo-wsl.nix
index fd2a674d..a57ea56d 100644
--- a/nixos/machines/jay-lenovo-wsl.nix
+++ b/nixos/machines/jay-lenovo-wsl.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, inputs, ... }:
+{ lib, pkgs, config, inputs, forEachUser, ... }:
 {
   imports = [
     ../configuration.nix
@@ -8,4 +8,8 @@
 
   wsl.defaultUser = "kat";
   system.stateVersion = "22.05";
+
+  home-manager.users = forEachUser {
+    home.stateVersion = "22.05";
+  };
 }
diff --git a/nixos/machines/jay-lenovo.nix b/nixos/machines/jay-lenovo.nix
index 47cea373..60910c23 100644
--- a/nixos/machines/jay-lenovo.nix
+++ b/nixos/machines/jay-lenovo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, forEachUser, ... }:
 
 {
   imports = [
@@ -51,4 +51,8 @@
   services.tlp.enable = true;
 
   system.stateVersion = "23.05";
+
+  home-manager.users = forEachUser {
+    home.stateVersion = "23.05";
+  };
 }
diff --git a/nixos/machines/nixquick.nix b/nixos/machines/nixquick.nix
index 4ec4fcbb..10fa9bce 100644
--- a/nixos/machines/nixquick.nix
+++ b/nixos/machines/nixquick.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, forEachUser, ... }:
 {
   imports = [
     ../configuration.nix
@@ -53,5 +53,9 @@
   services.xrdp.defaultWindowManager = "startplasma-x11";
   services.xrdp.openFirewall = true;
 
+  home-manager.users = forEachUser {
+    home.stateVersion = "23.11";
+  };
+
   system.stateVersion = "23.11";
 }