diff --git a/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml b/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
index 30f48cf..d1a6d7c 100644
--- a/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
+++ b/tcp_tests/environment/lab03_ovs_dpdk/nodes.yml
@@ -20,12 +20,12 @@
                 enabled: true
                 mode: active-backup
                 proto: manual
-                slaves: enp3s0f1
+                slaves: enp2s0f1
                 type: bond
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - enp3s0f1
+                - enp2s0f1
                 require_interfaces:
-                - enp3s0f1
+                - enp2s0f1
               bond0.2416:
                 enabled: true
                 proto: manual
@@ -55,18 +55,18 @@
                 proto: static
                 type: bridge
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - enp3s0f0
+                - enp2s0f0
                 require_interfaces:
-                - enp3s0f0
+                - enp2s0f0
               eth1:
                 enabled: true
-                name: enp3s0f1
+                name: enp2s0f1
                 proto: manual
                 type: eth
                 ipflush_onchange: true
               eth2:
                 enabled: true
-                name: enp3s0f0
+                name: enp2s0f0
                 proto: manual
                 type: eth
                 ipflush_onchange: true
@@ -87,12 +87,12 @@
                 enabled: true
                 mode: active-backup
                 proto: manual
-                slaves: eno2
+                slaves: enp2s0f1
                 type: bond
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - eno2
+                - enp2s0f1
                 require_interfaces:
-                - eno2
+                - enp2s0f1
               bond0.2416:
                 enabled: true
                 proto: manual
@@ -122,18 +122,18 @@
                 proto: static
                 type: bridge
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - eno1
+                - enp2s0f0
                 require_interfaces:
-                - eno1
+                - enp2s0f0
               eth1:
                 enabled: true
-                name: eno2
+                name: enp2s0f1
                 proto: manual
                 type: eth
                 ipflush_onchange: true
               eth2:
                 enabled: true
-                name: eno1
+                name: enp2s0f0
                 proto: manual
                 type: eth
                 ipflush_onchange: true
@@ -394,12 +394,12 @@
                 ovs_bridge: br-floating
                 ovs_type: OVSPort
                 proto: manual
-                slaves: enp2s0f1
+                slaves: enp3s0f1
                 type: bond
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - enp2s0f1
+                - enp3s0f1
                 require_interfaces:
-                - enp2s0f1
+                - enp3s0f1
               br-floating:
                 enabled: true
                 type: ovs_bridge
@@ -423,7 +423,7 @@
               primary_first_nic:
                 enabled: true
                 master: bond0
-                name: enp2s0f1
+                name: enp3s0f1
                 proto: manual
                 type: slave
                 ipflush_onchange: true
@@ -452,12 +452,12 @@
                 ovs_bridge: br-floating
                 ovs_type: OVSPort
                 proto: manual
-                slaves: enp2s0f1
+                slaves: eno2
                 type: bond
                 use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - enp2s0f1
+                - eno2
                 require_interfaces:
-                - enp2s0f1
+                - eno2
               br-floating:
                 enabled: true
                 type: ovs_bridge
@@ -481,65 +481,7 @@
               primary_first_nic:
                 enabled: true
                 master: bond0
-                name: enp2s0f1
-                proto: manual
-                type: slave
-                ipflush_onchange: true
-              prv-to-floating:
-                bridge: br-prv
-                enabled: true
-                peer: floating-to-prv
-                port_type: patch
-                type: ovs_port
-
-          classes:
-          - environment.lab03_ovs_dpdk.common
-
-        openstack_gateway_node03:
-          params:
-            # Use interfaces configuration from the context file,
-            # or generate your own 'linux.network.interface' object using
-            # additional inventory.
-            # For example, you can take the 'inventory_node_name' and find it's config
-            # in an additional dict inventory[inventory_node_name] loaded from custom_inventory.yaml,
-            # or skip the original context from 'cookiecutter' object and iterate only custom inventory.
-            linux_network_interfaces:
-              bond0:
-                enabled: true
-                mode: active-backup
-                ovs_bridge: br-floating
-                ovs_type: OVSPort
-                proto: manual
-                slaves: enp2s0f1
-                type: bond
-                use_interfaces: # Remove 'use_interfaces' after https://gerrit.mcp.mirantis.net/#/c/8344
-                - enp2s0f1
-                require_interfaces:
-                - enp2s0f1
-              br-floating:
-                enabled: true
-                type: ovs_bridge
-              br-prv:
-                enabled: true
-                type: ovs_bridge
-              br_ctl:
-                address: ${_param:_esc}{_param:single_address}
-                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
-                enabled: true
-                peer: prv-to-floating
-                port_type: patch
-                type: ovs_port
-              primary_first_nic:
-                enabled: true
-                master: bond0
-                name: enp2s0f1
+                name: eno2
                 proto: manual
                 type: slave
                 ipflush_onchange: true
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
index d7b0f4e..61db54b 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
@@ -227,7 +227,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp3s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -245,14 +245,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: enp3s0f0
+                - label: enp2s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_KVM01
-                - label: enp3s0f1
+                - label: enp2s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_KVM01
 
               network_config:
-                enp3s0f0:
+                enp2s0f0:
                   networks:
                    - admin
                 bond0:
@@ -260,7 +260,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp3s0f1
+                   - enp2s0f1
 
           - name: {{ HOSTNAME_KVM02 }}
             role: salt_minion
@@ -274,7 +274,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: eno1  # see 'interfaces' below.
+              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -292,14 +292,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: eno1
+                - label: enp2s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_KVM02
-                - label: eno2
+                - label: enp2s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_KVM02
 
               network_config:
-                eno1:
+                enp2s0f0:
                   networks:
                    - admin
                 bond0:
@@ -307,7 +307,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - eno2
+                   - enp2s0f1
 
           - name: {{ HOSTNAME_KVM03 }}
             role: salt_minion
@@ -484,7 +484,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp3s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -502,14 +502,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: enp2s0f0
+                - label: enp3s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_GTW01
-                - label: enp2s0f1
+                - label: enp3s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_GTW01
 
               network_config:
-                enp2s0f0:
+                enp3s0f0:
                   networks:
                    - admin
                 bond0:
@@ -517,7 +517,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp2s0f1
+                   - enp3s0f1
 
           - name: {{ HOSTNAME_GTW02 }}
             role: salt_minion
@@ -531,7 +531,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: eno1  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -549,14 +549,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: enp2s0f0
+                - label: eno1
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_GTW02
-                - label: enp2s0f1
+                - label: eno2
                   mac_address: !os_env ETH1_MAC_ADDRESS_GTW02
 
               network_config:
-                enp2s0f0:
+                eno1:
                   networks:
                    - admin
                 bond0:
@@ -564,4 +564,4 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp2s0f1
+                   - eno2