diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index 819d201c..db7f5af3 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -5,7 +5,6 @@
   ];
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/htpc/configuration.nix b/provision/hosts/htpc/configuration.nix
index bef0e2ef..1c58c5fe 100644
--- a/provision/hosts/htpc/configuration.nix
+++ b/provision/hosts/htpc/configuration.nix
@@ -4,7 +4,6 @@
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 66174ab4..6fdc4e68 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -9,7 +9,6 @@
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index 1bb0eaaa..db87de6c 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -4,7 +4,6 @@
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 62556a12..d295d7a9 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -17,7 +17,6 @@
   boot.kernelModules = [ "sg" ];
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.enable = true;
   networking.firewall.checkReversePath = "loose";
   networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/provision/hosts/wsl/configuration.nix b/provision/hosts/wsl/configuration.nix
index 76b53e74..2e5f4377 100644
--- a/provision/hosts/wsl/configuration.nix
+++ b/provision/hosts/wsl/configuration.nix
@@ -15,7 +15,6 @@ in
   };
 
   # Set networking options
-  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix
index 0486d0f8..8a181f7e 100644
--- a/provision/modules/base/default.nix
+++ b/provision/modules/base/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, inputs, pkgs, user, home-manager, ... }:
+{ config, lib, inputs, pkgs, user, home-manager, hostname, ... }:
 {
   imports = [
     ./terminal.nix
@@ -18,6 +18,9 @@
     };
   };
 
+  # Set networking options
+  networking.hostName = "${hostname}"; 
+
   # Add user age key to identity path
   age.identityPaths = [ 
     "/home/${user}/.ssh/keys/age"