diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index a8e0b3f..72dafa8 100755
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -44,11 +44,11 @@
     network = {
       hostName = "pi4";
       ipv4 = {
+        interface = "end0";
         method = "manual";
         address = "10.0.1.2/24";
         gateway = "10.0.1.1";
         dns = "1.1.1.1";
-        interface = "enabcm6e4ei0";
       };
       firewall = {
         enable = true;
@@ -58,11 +58,22 @@
       };
       networkmanager = {
         profiles = {
-          "static-enabcm6e4ei0" = {
+          "static-end0" = {
             type = "ethernet";
           };
         };
       };
     };
   };
+ 
+  virtualisation = {
+    waydroid.enable = false;
+    libvirtd.enable = false;
+  };
+
+  # Root user configuration - explicit to avoid conflicts with home-manager
+  users.users.root = {
+    isSystemUser = true;
+    isNormalUser = false;
+  };
 }
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index d9774f0..00a8fa1 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -30,6 +30,10 @@
     };
     network = {
       hostName = "pi5";
+      firewall = {
+        enable = true;
+        allowPing = true;
+      };
     };
   };
 }