diff --git a/hosts/cyper-pi-1/configuration.nix b/hosts/cyper-pi-1/configuration.nix
index 14becba..1a59457 100644
--- a/hosts/cyper-pi-1/configuration.nix
+++ b/hosts/cyper-pi-1/configuration.nix
@@ -19,8 +19,6 @@
     #    ];
 
     firewall = {
-      enable = true;
-      allowPing = true;
       allowedTCPPorts = [ 5432 ];
     };
   };
diff --git a/hosts/cyper-pi-2/configuration.nix b/hosts/cyper-pi-2/configuration.nix
index db59acc..8a95445 100644
--- a/hosts/cyper-pi-2/configuration.nix
+++ b/hosts/cyper-pi-2/configuration.nix
@@ -17,8 +17,6 @@
     #    ];
 
     firewall = {
-      enable = true;
-      allowPing = true;
       allowedTCPPorts = [ ];
     };
   };
diff --git a/nixos/default.nix b/nixos/default.nix
index 970a545..d8103d0 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -49,6 +49,11 @@
         };
       };
     };
+
+    firewall = {
+      enable = true;
+      allowPing = true;
+    };
   };
 
   # SSH configuration
@@ -66,7 +71,6 @@
     hashedPassword = "$6$TqAclAMz/DFP90Ve$HEN4t1pqK36rACeWctJOmLArkTWb/rIBYamu4sY8bPuDnqkVVyfOLqXKkgX8zBf9LKz02.mo4EKFRnYWIzcAX1";
     extraGroups = [
       "wheel"
-      "networkmanager"
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [