diff --git a/flake.nix b/flake.nix
index 9be79b6f..e7accfa8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,10 @@
     };
     homeConfigurations  = {
       "albert@nixos-laptop"  = libx.mkHome { hostname = "nixos-laptop";   username = "albert"; desktop = "gnome"; };
+      "root@nixos-laptop"    = libx.mkHome { hostname = "nixos-laptop";   username = "root";   desktop = "gnome"; };
+
       "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop";  username = "albert"; desktop = "gnome"; };
+      "root@nixos-desktop"   = libx.mkHome { hostname = "nixos-desktop";  username = "root";   desktop = "gnome"; };
     };
   };
 }
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 72bec1ef..cf2a84b5 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,6 +1,6 @@
 { config, pkgs, hostname, username, desktop, hmStateVersion, ... }: {
   imports = [ 
-    # Common app configs
+    # Common app configs - Will apply to all users managed by home-manager
     ./common/software/cli/bash.nix
     ./common/software/cli/btop.nix
     ./common/software/cli/git.nix
diff --git a/nixos/default.nix b/nixos/default.nix
index adbc179a..f9d06e48 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,14 +1,14 @@
 { lib, config, pkgs, hostname, stateVersion, username, desktop, ... }: {
   imports = [ 
       # Services
-      ./common/services/openssh.nix  
-      ./common/services/promtail.nix 
-      ./common/services/fail2ban.nix 
+      ./common/services/openssh.nix
+      ./common/services/promtail.nix
+      ./common/services/fail2ban.nix
       ./common/services/telegraf.nix
       ./common/services/tailscale.nix
       ./common/services/fwupd.nix
 
-      # Modules
+      # NixOS Modules
       ./common/modules/fonts.nix       # Font Configs
       ./common/modules/networking.nix  # Initial Networking configs
       ./common/modules/nixos.nix       # NixOS related items
@@ -36,7 +36,6 @@
     iftop 
     nload 
     iotop
-    NetworkManager
   ];
 
   # Select internationalisation properties.