diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
index 8ed34dc..d139bb1 100644
--- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
@@ -65,7 +65,7 @@
 
    # To be configured from inventory/fuel-devops by operator or autotests
    - 'echo "id: {hostname}" >> /etc/salt/minion'
-   - 'echo "master: 172.16.10.100" >> /etc/salt/minion'
+   - 'echo "master: 192.168.10.100" >> /etc/salt/minion'
 
    - echo "Restarting minion service with workarounds..."
    - rm -f /etc/salt/pki/minion/minion_master.pub
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
index 26c21d8..ba971f7 100644
--- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
@@ -73,7 +73,7 @@
 
    # To be configured from inventory/fuel-devops by operator or autotests
    - 'echo "id: {hostname}" >> /etc/salt/minion'
-   - 'echo "master: 172.16.10.100" >> /etc/salt/minion'
+   - 'echo "master: 192.168.10.100" >> /etc/salt/minion'
 
    - echo "Restarting minion service with workarounds..."
    - rm -f /etc/salt/pki/minion/minion_master.pub
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
index acfaf5b..986194a 100644
--- a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
@@ -163,18 +163,18 @@
 
               interfaces:
                 - label: ens3
-                  l2_network_device: private
+                  l2_network_device: admin
                   interface_model: *interface_model
                 - label: ens4
-                  l2_network_device: admin
+                  l2_network_device: private
                   interface_model: *interface_model
               network_config:
                 ens3:
                   networks:
-                    - private
+                    - admin
                 ens4:
                   networks:
-                    - admin
+                    - private
 
           - name: {{ HOSTNAME_CTL01 }}
             role: salt_minion
@@ -204,18 +204,18 @@
 
               interfaces: &interfaces
                 - label: eth0
-                  l2_network_device: private
+                  l2_network_device: admin
                   interface_model: *interface_model
                 - label: eth1
-                  l2_network_device: admin
+                  l2_network_device: private
                   interface_model: *interface_model
               network_config: &network_config
                 eth0:
                   networks:
-                    - private
+                    - admin
                 eth1:
                   networks:
-                    - admin
+                    - private
 
           - name: {{ HOSTNAME_CTL02 }}
             role: salt_minion
@@ -331,10 +331,10 @@
 
               interfaces: &all_interfaces
                 - label: ens3
-                  l2_network_device: private
+                  l2_network_device: admin
                   interface_model: *interface_model
                 - label: ens4
-                  l2_network_device: admin
+                  l2_network_device: private
                   interface_model: *interface_model
                 - label: ens5
                   l2_network_device: tenant
@@ -345,10 +345,10 @@
               network_config: &all_network_config
                 ens3:
                   networks:
-                    - private
+                    - admin
                 ens4:
                   networks:
-                    - admin
+                    - private
                 ens5:
                   networks:
                     - tenant