diff --git a/modules/netbird-docker.nix b/modules/netbird-docker.nix
index 1ba10b2..076fdaf 100644
--- a/modules/netbird-docker.nix
+++ b/modules/netbird-docker.nix
@@ -80,6 +80,9 @@ in {
           "traefik.http.routers.netbird-dashboard.priority" = "1";
           "traefik.http.services.dashboard.loadbalancer.server.port" = "80";
         };
+        dependsOn = [
+          "netbird-server"
+        ];
       };
       netbird-server = {
         image = "netbirdio/netbird-server:${serverVersion}";
@@ -155,6 +158,9 @@ in {
           "traefik.http.services.netbird-server-h2c.loadbalancer.server.port" = "80";
           "traefik.http.services.netbird-server-h2c.loadbalancer.server.scheme" = "h2c";
         };
+        dependsOn = [
+          "traefik"
+        ];
       };
       netbird-proxy = {
         image = "netbirdio/reverse-proxy:${serverVersion}";
diff --git a/modules/traefik.nix b/modules/traefik.nix
index 8bea41f..8888dac 100644
--- a/modules/traefik.nix
+++ b/modules/traefik.nix
@@ -76,6 +76,7 @@ in {
         ];
         extraOptions = [
           ''--mount=type=volume,source=certs,target=/certs,volume-driver=local''
+          "--ip=172.18.0.2"
           "--add-host=host.docker.internal:host-gateway"
           "--health-cmd=wget --spider --quiet http://localhost:8080/ping"
           "--health-interval=10s"
@@ -130,7 +131,5 @@ in {
       '';
     };
 
-    networking.firewall.extraCommands = "iptables -t nat -I PREROUTING -s 172.18.0.0/16 -d 172.18.0.0/16 -j MASQUERADE";
-
   };
 }