diff --git a/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml b/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
index d1a6d7c..e765c3d 100644
--- a/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
+++ b/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
@@ -234,7 +234,7 @@
               bond0:
                 enabled: true
                 mode: active-backup
-                ovs_bridge: br-floating
+                ovs_bridge: br_floating
                 ovs_type: OVSPort
                 proto: manual
                 slaves: enp3s0f1 enp5s0f0
@@ -253,7 +253,7 @@
                 - bond0
                 require_interfaces:
                 - bond0
-              br-prv:
+              br_prv:
                 address: ${_param:_esc}{_param:tenant_address}
                 enabled: true
                 netmask: 255.255.255.0
@@ -285,7 +285,7 @@
                 pci: '0000:05:00.2'
                 type: dpdk_ovs_port
               dpdkbond1:
-                bridge: br-prv
+                bridge: br_prv
                 enabled: true
                 mode: active-backup
                 type: dpdk_ovs_bond
@@ -319,7 +319,7 @@
               bond0:
                 enabled: true
                 mode: active-backup
-                ovs_bridge: br-floating
+                ovs_bridge: br_floating
                 ovs_type: OVSPort
                 proto: manual
 #                slaves: eth0 eth3
@@ -339,7 +339,7 @@
                 - bond0
                 require_interfaces:
                 - bond0
-              br-prv:
+              br_prv:
                 address: ${_param:_esc}{_param:tenant_address}
                 enabled: true
                 netmask: 255.255.255.0
@@ -371,7 +371,7 @@
                 pci: 0000:0b:00.0
                 type: dpdk_ovs_port
               dpdkbond1:
-                bridge: br-prv
+                bridge: br_prv
                 enabled: true
                 mode: active-backup
                 type: dpdk_ovs_bond
@@ -391,7 +391,7 @@
               bond0:
                 enabled: true
                 mode: active-backup
-                ovs_bridge: br-floating
+                ovs_bridge: br_floating
                 ovs_type: OVSPort
                 proto: manual
                 slaves: enp3s0f1
@@ -400,24 +400,30 @@
                 - enp3s0f1
                 require_interfaces:
                 - enp3s0f1
-              br-floating:
+              br_floating:
                 enabled: true
                 type: ovs_bridge
-              br-prv:
+              br_floating.2417:
+                address: 172.17.42.135
+                netmask: 255.255.255.192
+                enabled: true
+                proto: static
+                type: vlan
+              br_prv:
                 enabled: true
                 type: ovs_bridge
               br_ctl:
                 address: ${_param:_esc}{_param:single_address}
-                bridge: br-floating
+                bridge: br_floating
                 enabled: true
                 netmask: 255.255.255.0
                 ovs_options: tag=2416
                 proto: static
                 type: ovs_port
-              floating-to-prv:
-                bridge: br-floating
+              floating_to_prv:
+                bridge: br_floating
                 enabled: true
-                peer: prv-to-floating
+                peer: prv_to_floating
                 port_type: patch
                 type: ovs_port
               primary_first_nic:
@@ -427,10 +433,10 @@
                 proto: manual
                 type: slave
                 ipflush_onchange: true
-              prv-to-floating:
-                bridge: br-prv
+              prv_to_floating:
+                bridge: br_prv
                 enabled: true
-                peer: floating-to-prv
+                peer: floating_to_prv
                 port_type: patch
                 type: ovs_port
 
@@ -449,7 +455,7 @@
               bond0:
                 enabled: true
                 mode: active-backup
-                ovs_bridge: br-floating
+                ovs_bridge: br_floating
                 ovs_type: OVSPort
                 proto: manual
                 slaves: eno2
@@ -458,24 +464,30 @@
                 - eno2
                 require_interfaces:
                 - eno2
-              br-floating:
+              br_floating:
                 enabled: true
                 type: ovs_bridge
-              br-prv:
+              br_floating.2417:
+                address: 172.17.42.136
+                netmask: 255.255.255.192
+                enabled: true
+                proto: static
+                type: vlan
+              br_prv:
                 enabled: true
                 type: ovs_bridge
               br_ctl:
                 address: ${_param:_esc}{_param:single_address}
-                bridge: br-floating
+                bridge: br_floating
                 enabled: true
                 netmask: 255.255.255.0
                 ovs_options: tag=2416
                 proto: static
                 type: ovs_port
-              floating-to-prv:
-                bridge: br-floating
+              floating_to_prv:
+                bridge: br_floating
                 enabled: true
-                peer: prv-to-floating
+                peer: prv_to_floating
                 port_type: patch
                 type: ovs_port
               primary_first_nic:
@@ -485,10 +497,10 @@
                 proto: manual
                 type: slave
                 ipflush_onchange: true
-              prv-to-floating:
-                bridge: br-prv
+              prv_to_floating:
+                bridge: br_prv
                 enabled: true
-                peer: floating-to-prv
+                peer: floating_to_prv
                 port_type: patch
                 type: ovs_port
 
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
index 61db54b..d45287d 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
@@ -77,11 +77,11 @@
             l2_network_device: +1
 
       external-pool01:
-        net: {{ os_env('EXTERNAL_ADDRESS_POOL01', '10.167.16.0/24:24') }}
+        net: {{ os_env('EXTERNAL_ADDRESS_POOL01', '172.17.42.128/26:26') }}
         params:
           ip_reserved:
             gateway: +1
-            l2_network_device: +1
+            l2_network_device: -2
 
     groups: