diff --git a/trellis/bgpdbgp1.conf b/trellis/bgpdbgp1.conf
index da74da9..0c33b82 100644
--- a/trellis/bgpdbgp1.conf
+++ b/trellis/bgpdbgp1.conf
@@ -8,9 +8,9 @@
 ip prefix-list 1 seq 20 permit 10.1.2.0/24
 ip prefix-list 1 seq 30 permit 10.0.3.0/24
 ip prefix-list 1 seq 40 permit 10.0.4.0/24
-ip prefix-list 1 seq 40 permit 10.5.6.0/24
-ip prefix-list 1 seq 50 permit 10.11.1.0/24
-ip prefix-list 1 seq 60 permit 10.11.2.0/24
+ip prefix-list 1 seq 50 permit 10.5.6.0/24
+ip prefix-list 1 seq 60 permit 10.11.1.0/24
+ip prefix-list 1 seq 70 permit 10.11.2.0/24
 !
 route-map NEXTHOP41 permit 10
 match ip address prefix-list 1
diff --git a/trellis/bgpdbgp2.conf b/trellis/bgpdbgp2.conf
index c9f747f..12d2c42 100644
--- a/trellis/bgpdbgp2.conf
+++ b/trellis/bgpdbgp2.conf
@@ -8,9 +8,9 @@
 ip prefix-list 1 seq 20 permit 10.1.2.0/24
 ip prefix-list 1 seq 30 permit 10.0.3.0/24
 ip prefix-list 1 seq 40 permit 10.0.4.0/24
-ip prefix-list 1 seq 40 permit 10.5.6.0/24
-ip prefix-list 1 seq 50 permit 10.11.1.0/24
-ip prefix-list 1 seq 60 permit 10.11.2.0/24
+ip prefix-list 1 seq 50 permit 10.5.6.0/24
+ip prefix-list 1 seq 60 permit 10.11.1.0/24
+ip prefix-list 1 seq 70 permit 10.11.2.0/24
 !
 route-map NEXTHOP45 permit 10
 match ip address prefix-list 1
diff --git a/trellis/trellis_remote_dhcp.json b/trellis/trellis_remote_dhcp.json
index a836a0f..2566122 100644
--- a/trellis/trellis_remote_dhcp.json
+++ b/trellis/trellis_remote_dhcp.json
@@ -181,6 +181,18 @@
                     "serverIps": ["10.0.99.3"],
                     "gatewayIps": ["10.0.1.1"]
                 }
+            ],
+            "indirect" : [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/8",
+                    "serverIps": ["10.0.99.3"],
+                    "gatewayIps": ["10.0.1.1"],
+                    "relayAgentIps": {
+                        "of:0000000000000204": {
+                            "ipv4": "10.0.4.254"
+                        }
+                    }
+                }
             ]
         }
     }
diff --git a/trellis/trellis_remote_dhcp.py b/trellis/trellis_remote_dhcp.py
index 887e17d..0c0043f 100755
--- a/trellis/trellis_remote_dhcp.py
+++ b/trellis/trellis_remote_dhcp.py
@@ -49,7 +49,7 @@
         # NOTE avoid using 10.0.1.0/24 which is the default subnet of quaggas
         # NOTE avoid using 00:00:00:00:00:xx which is the default mac of host behind upstream router
         # IPv4 Hosts
-        h1 = self.addHost('h1', cls=DhcpClient, mac='00:aa:00:00:00:01')
+        h1 = self.addHost('h1', cls=DhcpClient, mac='00:ee:00:00:00:01')
         h2 = self.addHost('h2', cls=DhcpClient, mac='00:aa:00:00:00:02')
         h3 = self.addHost('h3', cls=DhcpClient, mac='00:aa:00:00:00:03')
         h4 = self.addHost('h4', cls=DhcpClient, mac='00:aa:00:00:00:04')