diff --git a/modules/system/networking.nix b/modules/system/networking.nix
index 1cbd680..e718735 100644
--- a/modules/system/networking.nix
+++ b/modules/system/networking.nix
@@ -10,6 +10,11 @@
       allowedUDPPorts = [ config.services.tailscale.port ];
     };
   };
-  systemd.network.wait-online.enable = false;
+  systemd = { 
+    network.wait-online.enable = false;
+    services.tailscaled.serviceConfig.Environment = [
+      "TS_DEBUG_FIREWALL_MODE=nftables"
+    ];
+  };
   boot.initrd.systemd.network.wait-online.enable = false;
 }
diff --git a/modules/system/services.nix b/modules/system/services.nix
index edd4165..07c39ad 100644
--- a/modules/system/services.nix
+++ b/modules/system/services.nix
@@ -16,8 +16,5 @@
       jack.enable = true;
     };
     tailscale.enable = true;
-    tailscaled.serviceConfig.Environment = [ 
-      "TS_DEBUG_FIREWALL_MODE=nftables" 
-    ];
   };
 }