diff --git a/flake.nix b/flake.nix
index bcf643b..15ccdc0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,7 +111,7 @@
               inherit username;
               system = "x86_64-linux";
               homeDirectory = "/home/${username}";
-              stateVersion = "21.11";
+              stateVersion = "21.05";
             });        
       };
 }
diff --git a/modules/stateversion.nix b/modules/stateversion.nix
new file mode 100644
index 0000000..7c0ffe4
--- /dev/null
+++ b/modules/stateversion.nix
@@ -0,0 +1,4 @@
+{ config, lib, pkgs, ...}:
+{
+  system.stateVersion = "21.05";
+}
diff --git a/modules/users.nix b/modules/users.nix
index d0f5f74..83d3f8c 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -139,6 +139,6 @@ with lib; {
                 (mapUsers mkUser)
               ];
           };
-          home-manager.users = (mapAllUsers mkGitUser);
+          home-manager.users = (mapAllUsers mkGitUser) // (mapAllUsersAndRoot (_: { config.home.stateVersion = mkDefault "21.05"; }));
         };
 }