diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
index 4d3ffd6..0cec934 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
@@ -1,77 +1,76 @@
-nodes:
-    cfg01.cookied-cicd-bm-os-contrail40-maas.local:
-      reclass_storage_name: infra_config_node01
-      roles:
-      - infra_config
-      - linux_system_codename_xenial
+nodes:
+    cfg01.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_config_node01
+      roles:
+      - infra_config
+      - linux_system_codename_xenial
       interfaces:
         ens3:
           role: single_static_mgm
-        ens4:
-          role: single_static_ctl
-    # Physical nodes
-
-    kvm01.cookied-cicd-bm-os-contrail40-maas.local:
-      reclass_storage_name: infra_kvm_node01
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        one1:
+        ens4:
+          role: single_static_ctl
+    # Physical nodes
+
+    kvm01.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node01
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp9s0f0:
           role: single_dhcp
-        one2:
-          role: bond0_ab_ovs_vlan_ctl
-        ten1:
+        enp9s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+        ens11f0:
           role: single_mgm_manual
-
-    kvm02.cookied-cicd-bm-os-contrail40-maas.local:
-      reclass_storage_name: infra_kvm_node02
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        one1:
+
+    kvm02.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node02
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp9s0f0:
           role: single_dhcp
-        one2:
-          role: bond0_ab_ovs_vlan_ctl
-        ten1:
+        enp9s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+        ens11f0:
           role: single_mgm_manual
-
-    kvm03.cookied-cicd-bm-os-contrail40-maas.local:
-      reclass_storage_name: infra_kvm_node03
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        one1:
+
+    kvm03.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node03
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp9s0f0:
           role: single_dhcp
-        one2:
-          role: bond0_ab_ovs_vlan_ctl
-        ten1:
+        enp9s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+        ens11f0:
           role: single_mgm_manual
-
-    osd<<count>>:
-      reclass_storage_name: ceph_osd_rack01
-      roles:
-      - ceph_osd
-      - linux_system_codename_xenial
-      interfaces:
-        one1:
+
+    osd<<count>>:
+      reclass_storage_name: ceph_osd_rack01
+      roles:
+      - ceph_osd
+      - linux_system_codename_xenial
+      interfaces:
+        enp2s0f0:
           role: single_dhcp
-        one2:
-          role: single_vlan_ctl
+        enp2s0f1:
+          role: single_vlan_ctl
 #          role: bond0_ab_vlan_ceph_storage_backend
-
-    cmp<<count>>:
-      reclass_storage_name: openstack_compute_rack01
-      roles:
-      - openstack_compute
-      - linux_system_codename_xenial
-      interfaces:
-        #one1: unused
-        one2:
+
+    cmp<<count>>:
+      reclass_storage_name: openstack_compute_rack01
+      roles:
+      - openstack_compute
+      - linux_system_codename_xenial
+      interfaces:
+        enp2s0f1:
           role: single_dhcp
-        ten1:
-          role: bond0_ab_contrail
-        ten2:
-          role: single_vlan_ctl
+        enp5s0f0:
+          role: bond0_ab_contrail
+        enp5s0f1:
+          role: single_vlan_ctl
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
index cb30db6..8446f86 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
@@ -129,7 +129,7 @@
           # pxe_interface_mac:
           pxe_interface_mac: "0c:c4:7a:6c:83:56"
           interfaces:
-            one1:
+            enp9s0f0:
               mac: "0c:c4:7a:6c:83:56"
               mode: "static"
               ip: "172.16.49.67"
@@ -145,7 +145,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:6c:84:2c"
           interfaces:
-            one1:
+            enp9s0f0:
               mac: "0c:c4:7a:6c:84:2c"
               mode: "static"
               ip: "172.16.49.68"
@@ -161,7 +161,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:6c:83:54"
           interfaces:
-            one1:
+            enp9s0f0:
               mac: "0c:c4:7a:6c:83:54"
               mode: "static"
               ip: "172.16.49.69"
@@ -177,7 +177,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:55:6a:d4"
           interfaces:
-            one1:
+            enp2s0f0:
               mac: "0c:c4:7a:55:6a:d4"
               mode: "static"
               ip: "172.16.49.70"
@@ -191,10 +191,10 @@
         osd002: # #cz7343-kvm.host-telecom.com
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
-          pxe_interface_mac: "0c:c4:7a:55:6a:57"
+          pxe_interface_mac: "0c:c4:7a:55:6a:56"
           interfaces:
-            one1:
-              mac: "0c:c4:7a:55:6a:57"
+            enp2s0f0:
+              mac: "0c:c4:7a:55:6a:56"
               mode: "static"
               ip: "172.16.49.71"
               subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
@@ -209,7 +209,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:55:6a:2a"
           interfaces:
-            one1:
+            enp2s0f0:
               mac: "0c:c4:7a:55:6a:2a"
               mode: "static"
               ip: "172.16.49.72"
@@ -225,7 +225,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:54:a2:5f"
           interfaces:
-            one2:
+            enp2s0f1:
               mac: "0c:c4:7a:54:a2:5f"
               mode: "static"
               ip: "172.16.49.73"
@@ -241,7 +241,7 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:54:a0:51"
           interfaces:
-            one2:
+            enp2s0f1:
               mac: "0c:c4:7a:54:a0:51"
               mode: "static"
               ip: "172.16.49.74"