diff --git a/examples/interfaces b/examples/interfaces
index 7441c60..3aac5ea 100644
--- a/examples/interfaces
+++ b/examples/interfaces
@@ -17,34 +17,44 @@ iface enp1s0f1 inet manual
 
 auto bond0
 iface bond0 inet manual
-    #mtu 8900
+    mtu 8900
     bond-mode 802.3ad
     bond-miimon 100
     bond-lacp-rate fast
     bond-slaves enp1s0f0 enp1s0f1
     bond-xmit-hash-policy layer3+4
 
-auto br-mgmt
-iface br-mgmt inet static
+auto br-uplink
+iface br-uplink inet static
     bridge_stp off
     bridge_waitport 0
     bridge_fd 0
-    bridge_ports bond0 veth-int-mgmt
+    bridge_ports bond0 vdown-mgmt vdown-flat
     address 192.169.91.98
     netmask 255.255.255.240
     gateway 192.169.91.97
     dns-nameserver 64.31.5.1
     dns-nameserver 64.31.5.2
 
-auto veth-int-mgmt
-iface veth-int-mgmt inet manual
-    pre-up ip link add dev veth-int-mgmt type veth peer name veth-int-flat
-
-auto br-flat
-iface br-flat inet manual
+auto br-mgmt
+iface br-mgmt inet manual
     bridge_stp off
     bridge_waitport 0
     bridge_fd 0
-    bridge_ports veth-int-flat
+    bridge_ports vup-mgmt
+
+auto vdown-mgmt
+iface vdown-mgmt inet manual
+    pre-up ip link add dev vdown-mgmt type veth peer name vup-mgmt
+    pre-up ip link set vdown-mgmt mtu 8900
+    pre-up ip link set vup-mgmt mtu 8900
+    post-up ip link set vup-mgmt up
+
+auto vdown-flat
+iface vdown-flat inet manual
+    pre-up ip link add dev vdown-flat type veth peer name vup-flat
+    pre-up ip link set vdown-flat mtu 8900
+    pre-up ip link set vup-flat mtu 8900
+    post-up ip link set vup-flat up
 
 source /etc/network/interfaces.d/*.cfg
diff --git a/openstack_deploy/openstack_inventory.json b/openstack_deploy/openstack_inventory.json
index e02f25e..a96abad 100644
--- a/openstack_deploy/openstack_inventory.json
+++ b/openstack_deploy/openstack_inventory.json
@@ -28,6 +28,7 @@
           },
           "eth12_address": {
             "bridge": "br-flat",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -60,6 +61,7 @@
           },
           "eth12_address": {
             "bridge": "br-flat",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -92,6 +94,7 @@
           },
           "eth12_address": {
             "bridge": "br-flat",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -124,6 +127,7 @@
           },
           "eth12_address": {
             "bridge": "br-flat",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -156,6 +160,7 @@
           },
           "eth12_address": {
             "bridge": "br-flat",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -465,6 +470,7 @@
           "eth12_address": {
             "bridge": "br-flat",
             "interface": "eth12",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -890,6 +896,7 @@
           "eth12_address": {
             "bridge": "br-flat",
             "interface": "eth12",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -1315,6 +1322,7 @@
           "eth12_address": {
             "bridge": "br-flat",
             "interface": "eth12",
+            "mtu": 8900,
             "netmask": null,
             "type": "veth"
           }
@@ -1483,11 +1491,12 @@
           "network": {
             "container_bridge": "br-flat",
             "container_interface": "eth12",
+            "container_mtu": 8900,
             "container_type": "veth",
             "group_binds": [
               "neutron_linuxbridge_agent"
             ],
-            "host_bind_override": "bond0",
+            "host_bind_override": "vup-flat",
             "net_name": "flat",
             "type": "flat"
           }
diff --git a/openstack_deploy/openstack_user_config.yml b/openstack_deploy/openstack_user_config.yml
index 87fd4d1..a86f51c 100644
--- a/openstack_deploy/openstack_user_config.yml
+++ b/openstack_deploy/openstack_user_config.yml
@@ -42,7 +42,8 @@ global_overrides:
         container_bridge: "br-flat"
         container_type: "veth"
         container_interface: "eth12"
-        host_bind_override: bond0
+        container_mtu: 8900
+        host_bind_override: vup-flat
         type: "flat"
         net_name: "flat"
         group_binds:
diff --git a/openstack_deploy/user_variables.yml b/openstack_deploy/user_variables.yml
index f66701e..7fb1b2b 100644
--- a/openstack_deploy/user_variables.yml
+++ b/openstack_deploy/user_variables.yml
@@ -31,6 +31,11 @@ global_environment_variables:
 neutron_l2_population: True
 neutron_vxlan_group:
 
+# Set the MTU correctly so VXLAN tenant networks recehive 1500 byte MTUs
+neutron_neutron_conf_overrides:
+  DEFAULT:
+    global_physnet_mtu: 1550
+
 # Enable novnc instead of spice
 nova_console_type: novnc