diff --git a/overlays/_common/ovs-config.sh.j2 b/overlays/_common/ovs-config.sh.j2
index c68721a..1c1e664 100755
--- a/overlays/_common/ovs-config.sh.j2
+++ b/overlays/_common/ovs-config.sh.j2
@@ -24,25 +24,28 @@ ovs-vsctl add port vpp${LAB}-2-0 tag 21
 ovs-vsctl add port vpp${LAB}-2-1 tag 22
 ovs-vsctl add port vpp${LAB}-3-0 tag 22
 
+# Enable QinQ by allowing 2 VLANs to be stacked
+ovs-vsctl set Open_vSwitch . other_config:vlan-limit=2
+
 ## Wire host${LAB}-0-[0123] to e2 of all VPP machines
-ovs-vsctl set port vpp${LAB}-0-2 tag=30
-ovs-vsctl set port host${LAB}-0-0 tag=30
-ovs-vsctl set port vpp${LAB}-1-2 tag=31
-ovs-vsctl set port host${LAB}-0-1 tag=31
-ovs-vsctl set port vpp${LAB}-2-2 tag=32
-ovs-vsctl set port host${LAB}-0-2 tag=32
-ovs-vsctl set port vpp${LAB}-3-2 tag=33
-ovs-vsctl set port host${LAB}-0-3 tag=33
+ovs-vsctl set port vpp${LAB}-0-2  vlan_mode=dot1q-tunnel tag=30
+ovs-vsctl set port host${LAB}-0-0 vlan_mode=dot1q-tunnel tag=30
+ovs-vsctl set port vpp${LAB}-1-2  vlan_mode=dot1q-tunnel tag=31
+ovs-vsctl set port host${LAB}-0-1 vlan_mode=dot1q-tunnel tag=31
+ovs-vsctl set port vpp${LAB}-2-2  vlan_mode=dot1q-tunnel tag=32
+ovs-vsctl set port host${LAB}-0-2 vlan_mode=dot1q-tunnel tag=32
+ovs-vsctl set port vpp${LAB}-3-2  vlan_mode=dot1q-tunnel tag=33
+ovs-vsctl set port host${LAB}-0-3 vlan_mode=dot1q-tunnel tag=33
 
 ## Wire host${LAB}-1-[0123] to e3 of all VPP machines
-ovs-vsctl set port vpp${LAB}-0-3 tag=40
-ovs-vsctl set port host${LAB}-1-0 tag=40
-ovs-vsctl set port vpp${LAB}-1-3 tag=41
-ovs-vsctl set port host${LAB}-1-1 tag=41
-ovs-vsctl set port vpp${LAB}-2-3 tag=42
-ovs-vsctl set port host${LAB}-1-2 tag=42
-ovs-vsctl set port vpp${LAB}-3-3 tag=43
-ovs-vsctl set port host${LAB}-1-3 tag=43
+ovs-vsctl set port vpp${LAB}-0-3  vlan_mode=dot1q-tunnel tag=40
+ovs-vsctl set port host${LAB}-1-0 vlan_mode=dot1q-tunnel tag=40
+ovs-vsctl set port vpp${LAB}-1-3  vlan_mode=dot1q-tunnel tag=41
+ovs-vsctl set port host${LAB}-1-1 vlan_mode=dot1q-tunnel tag=41
+ovs-vsctl set port vpp${LAB}-2-3  vlan_mode=dot1q-tunnel tag=42
+ovs-vsctl set port host${LAB}-1-2 vlan_mode=dot1q-tunnel tag=42
+ovs-vsctl set port vpp${LAB}-3-3  vlan_mode=dot1q-tunnel tag=43
+ovs-vsctl set port host${LAB}-1-3 vlan_mode=dot1q-tunnel tag=43
 
 ## Wire tap${LAB}-0-0 as 'rx' tap
 MIRROR=mirror-rx