diff --git a/hostHelper.nix b/hostHelper.nix
index 2bca73c..b096499 100644
--- a/hostHelper.nix
+++ b/hostHelper.nix
@@ -10,5 +10,15 @@ in
     modules = [
       {networking.hostName = hostname;}
       (./hosts/${hostname})
+
+      {
+        # This value determines the NixOS release from which the default
+        # settings for stateful data, like file locations and database versions
+        # on your system were taken. It‘s perfectly fine and recommended to leave
+        # this value at the release version of the first install of this system.
+        # Before changing this value read the documentation for this option
+        # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+        system.stateVersion = hostOptions.stateVersion; # Did you read the comment?
+      }
     ];
   }
diff --git a/hosts/crocoite/default.nix b/hosts/crocoite/default.nix
index d0c05ba..0859c5d 100644
--- a/hosts/crocoite/default.nix
+++ b/hosts/crocoite/default.nix
@@ -5,13 +5,6 @@
   nixos-unstable,
   ...
 }: {
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.05"; # Did you read the comment?
 
   #nixpkgs.overlays = [ overlays.unstable-packages ];
   nixpkgs = {
diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix
index 2fffeb2..234c358 100644
--- a/hosts/game-luanti/default.nix
+++ b/hosts/game-luanti/default.nix
@@ -4,31 +4,13 @@
   modulesPath,
   ...
 }: {
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.05"; # Did you read the comment?
 
-  # Disable if you don't want unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  nix = {
-  # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
-  # focused on correctness, usability, and growth –
-  # and committed to doing right by its community.
-    package = pkgs.lix;
-
-    settings.experimental-features = ["nix-command" "flakes"];
-  };
 
   imports = [
     ./hardware-configuration.nix
 
-    ../../modules/locale.nix
-
+    ../../system_profiles/defaults.nix
     ../../system_profiles/mini-container.nix
+
   ];
 }
diff --git a/hosts/jitsi/default.nix b/hosts/jitsi/default.nix
index 941205d..f76da0b 100644
--- a/hosts/jitsi/default.nix
+++ b/hosts/jitsi/default.nix
@@ -4,29 +4,16 @@
   modulesPath,
   ...
 }: {
-  #networking.hostName = "jitsi"; # Define your hostname.
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
-
   nixpkgs.config = {
     # Disable if you don't want unfree packages
     allowUnfree = true;
   };
 
-  # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
-  # focused on correctness, usability, and growth –
-  # and committed to doing right by its community.
-  nix.package = pkgs.lix;
 
   imports = [
     ./hardware-configuration.nix
 
-    ../../modules/locale.nix
-
-    ../../system_profiles/mini.nix
+    ../../system_profiles/defaults.nix
+    ../../system_profiles/mini-container.nix
+  ];
 }
diff --git a/outputs.nix b/outputs.nix
index b9332f0..4fce707 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -15,9 +15,10 @@ in {
   # NixOS configuration entrypoint
   # Available through 'nixos-rebuild --flake .#your-hostname'
   nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) {
-    crocoite = {};
-    game-luanti = {unstable = true;};
-    #jitsi = {};
+    crocoite = {stateVersion = "24.05";};
+
+    jitsi = {stateVersion = "24.11";};
+    game-luanti = {stateVersion = "25.05"; unstable = true;};
   };