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..575b7d7 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
@@ -4,9 +4,9 @@
       roles:
       - infra_config
       - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_static_mgm
+      interfaces:
+        ens3:
+          role: single_static_mgm
         ens4:
           role: single_static_ctl
     # Physical nodes
@@ -17,12 +17,12 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        one1:
-          role: single_dhcp
-        one2:
+        enp9s0f0:
+          role: single_dhcp
+        enp9s0f1:
           role: bond0_ab_ovs_vlan_ctl
-        ten1:
-          role: single_mgm_manual
+        ens11f0:
+          role: single_mgm_manual
 
     kvm02.cookied-cicd-bm-os-contrail40-maas.local:
       reclass_storage_name: infra_kvm_node02
@@ -30,12 +30,12 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        one1:
-          role: single_dhcp
-        one2:
+        enp9s0f0:
+          role: single_dhcp
+        enp9s0f1:
           role: bond0_ab_ovs_vlan_ctl
-        ten1:
-          role: single_mgm_manual
+        ens11f0:
+          role: single_mgm_manual
 
     kvm03.cookied-cicd-bm-os-contrail40-maas.local:
       reclass_storage_name: infra_kvm_node03
@@ -43,12 +43,12 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        one1:
-          role: single_dhcp
-        one2:
+        enp9s0f0:
+          role: single_dhcp
+        enp9s0f1:
           role: bond0_ab_ovs_vlan_ctl
-        ten1:
-          role: single_mgm_manual
+        ens11f0:
+          role: single_mgm_manual
 
     osd<<count>>:
       reclass_storage_name: ceph_osd_rack01
@@ -56,11 +56,11 @@
       - ceph_osd
       - linux_system_codename_xenial
       interfaces:
-        one1:
-          role: single_dhcp
-        one2:
+        enp2s0f0:
+          role: single_dhcp
+        enp2s0f1:
           role: single_vlan_ctl
-#          role: bond0_ab_vlan_ceph_storage_backend
+#          role: bond0_ab_vlan_ceph_storage_backend
 
     cmp<<count>>:
       reclass_storage_name: openstack_compute_rack01
@@ -68,10 +68,9 @@
       - openstack_compute
       - linux_system_codename_xenial
       interfaces:
-        #one1: unused
-        one2:
-          role: single_dhcp
-        ten1:
+        enp2s0f1:
+          role: single_dhcp
+        enp5s0f0:
           role: bond0_ab_contrail
-        ten2:
+        enp5s0f1:
           role: single_vlan_ctl