diff --git a/nixos/boxes/colony/vms/estuary/bgp.nix b/nixos/boxes/colony/vms/estuary/bgp.nix
index f08f639..a7fc634 100644
--- a/nixos/boxes/colony/vms/estuary/bgp.nix
+++ b/nixos/boxes/colony/vms/estuary/bgp.nix
@@ -38,10 +38,11 @@ in
           router id from "wan";
 
           protocol device {}
-          #protocol direct {
-          #	interface "devplayer0";
-          #	ipv6;
-          #}
+          protocol direct {
+            interface "wan";
+            ipv4;
+            ipv6;
+          }
           protocol static {
             # Special case: We have to do the routing on behalf of this _internal_ next-hop
             #route INTNET6 via "devplayer0";
@@ -65,7 +66,6 @@ in
           }
           protocol kernel kernel6 {
             ipv6 {
-              #import filter bgp_export;
               import none;
               export filter {
                 if net ~ OWNNETSET6 then reject;
diff --git a/nixos/boxes/colony/vms/estuary/default.nix b/nixos/boxes/colony/vms/estuary/default.nix
index 73c682e..14d1a0d 100644
--- a/nixos/boxes/colony/vms/estuary/default.nix
+++ b/nixos/boxes/colony/vms/estuary/default.nix
@@ -92,10 +92,25 @@
                   '';
                   wantedBy = [ "multi-user.target" ];
                 };
+
+                bird2 =
+                let
+                  waitOnline = "systemd-networkd-wait-online@wan.service";
+                in
+                {
+                  after = [ waitOnline ];
+                  requires = [ waitOnline ];
+                };
               };
             };
 
             systemd.network = {
+              config = {
+                networkConfig = {
+                  ManageForeignRoutes = false;
+                };
+              };
+
               links = {
                 "10-wan" = {
                   matchConfig.MACAddress = "d0:50:99:fa:a7:99";