diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index c82139c..dd0ba70 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -22,4 +22,6 @@
     libvirtd.enable = true;
     stateVersion = "24.11";
   };
+
+  services.globalprotect.enable = true;
 }
diff --git a/hosts/iso/users/main/default.nix b/hosts/iso/users/main/default.nix
index d8b8d24..26b7a3a 100644
--- a/hosts/iso/users/main/default.nix
+++ b/hosts/iso/users/main/default.nix
@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = true;
-      remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.11";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    remote-desktop.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/kitty/users/main/default.nix b/hosts/kitty/users/main/default.nix
index 1a981b2..bbe7e61 100644
--- a/hosts/kitty/users/main/default.nix
+++ b/hosts/kitty/users/main/default.nix
@@ -1,9 +1,7 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = false;
-      stateVersion = lib.mkForce "24.05";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = false;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/lacros/users/main/default.nix b/hosts/lacros/users/main/default.nix
index d8b8d24..26b7a3a 100644
--- a/hosts/lacros/users/main/default.nix
+++ b/hosts/lacros/users/main/default.nix
@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = true;
-      remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.11";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    remote-desktop.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/midas/users/main/default.nix b/hosts/midas/users/main/default.nix
index be52ead..9c6469d 100644
--- a/hosts/midas/users/main/default.nix
+++ b/hosts/midas/users/main/default.nix
@@ -1,11 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = true;
-      gaming.enable = true;
-      production.enable = true;
-      stateVersion = lib.mkForce config.system.stateVersion;
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    gaming.enable = true;
+    production.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/prophet/users/main/default.nix b/hosts/prophet/users/main/default.nix
index 1a981b2..9366cad 100644
--- a/hosts/prophet/users/main/default.nix
+++ b/hosts/prophet/users/main/default.nix
@@ -1,9 +1,6 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = false;
-      stateVersion = lib.mkForce "24.05";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/redmond/users/main/default.nix b/hosts/redmond/users/main/default.nix
index cfe5b79..26b7a3a 100644
--- a/hosts/redmond/users/main/default.nix
+++ b/hosts/redmond/users/main/default.nix
@@ -1,10 +1,8 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = true;
-      remote-desktop.enable = true;
-      stateVersion = lib.mkForce "24.05";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    remote-desktop.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/hosts/tower/users/main/default.nix b/hosts/tower/users/main/default.nix
index 2235af0..9c6469d 100644
--- a/hosts/tower/users/main/default.nix
+++ b/hosts/tower/users/main/default.nix
@@ -1,12 +1,9 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}" = {
-    home = {
-      desktop.enable = true;
-      gaming.enable = true;
-      production.enable = true;
-      school.enable = true;
-      stateVersion = lib.mkForce "24.05";
-    };
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    gaming.enable = true;
+    production.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
   };
 }
diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix
index efbd725..0b904df 100644
--- a/modules/home/programs/misc/school/default.nix
+++ b/modules/home/programs/misc/school/default.nix
@@ -4,5 +4,6 @@
     freerdp
     gpauth
     remmina
+    globalprotect-openconnect
   ];
 }