diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
index c9b633d..73f316a 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
@@ -1,5 +1,5 @@
 nodes:
-    cfg01.cookied-cicd-bm-os-contrail40-maas.local:
+    cfg01.cookied-cicd-bm-os-contrail32-maas.local:
       reclass_storage_name: infra_config_node01
       roles:
       - infra_config
@@ -11,43 +11,43 @@
           role: single_static_ctl
     # Physical nodes
 
-    kvm01.cookied-cicd-bm-os-contrail40-maas.local:
+    kvm01.cookied-cicd-bm-os-contrail32-maas.local:
       reclass_storage_name: infra_kvm_node01
       roles:
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp9s0f0:
+        one1:
           role: single_dhcp
-        enp9s0f1:
+        one2:
           role: bond0_ab_ovs_vlan_ctl
-        ens11f0:
+        ten1:
           role: single_mgm_manual
 
-    kvm02.cookied-cicd-bm-os-contrail40-maas.local:
+    kvm02.cookied-cicd-bm-os-contrail32-maas.local:
       reclass_storage_name: infra_kvm_node02
       roles:
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp9s0f0:
+        one1:
           role: single_dhcp
-        enp9s0f1:
+        one2:
           role: bond0_ab_ovs_vlan_ctl
-        ens11f0:
+        ten1:
           role: single_mgm_manual
 
-    kvm03.cookied-cicd-bm-os-contrail40-maas.local:
+    kvm03.cookied-cicd-bm-os-contrail32-maas.local:
       reclass_storage_name: infra_kvm_node03
       roles:
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp9s0f0:
+        one1:
           role: single_dhcp
-        enp9s0f1:
+        one2:
           role: bond0_ab_ovs_vlan_ctl
-        ens11f0:
+        ten1:
           role: single_mgm_manual
 
     osd<<count>>:
@@ -56,9 +56,9 @@
       - ceph_osd
       - linux_system_codename_xenial
       interfaces:
-        enp2s0f0:
+        one1:
           role: single_dhcp
-        enp2s0f1:
+        one2:
           role: single_vlan_ctl
 #          role: bond0_ab_vlan_ceph_storage_backend
 
@@ -68,9 +68,10 @@
       - openstack_compute
       - linux_system_codename_xenial
       interfaces:
-        enp2s0f1:
+        #one1: unused
+        one2:
           role: single_dhcp
-        enp5s0f0:
+        ten1:
           role: bond0_ab_contrail
-        enp5s0f1:
-          role: single_vlan_ctl
\ No newline at end of file
+        ten2:
+          role: single_vlan_ctl
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
index 3b285cc..063cf44 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
@@ -129,15 +129,16 @@
           # pxe_interface_mac:
           pxe_interface_mac: "0c:c4:7a:6c:83:56"
           interfaces:
-            enp9s0f0:
+            one1:
               mac: "0c:c4:7a:6c:83:56"
               mode: "static"
               ip: "172.16.49.67"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "5.43.225.117"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         kvm02: # #cz7342-kvm.host-telecom.com
@@ -145,15 +146,16 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:6c:84:2c"
           interfaces:
-            enp9s0f0:
+            one1:
               mac: "0c:c4:7a:6c:84:2c"
               mode: "static"
               ip: "172.16.49.68"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "5.43.225.118"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         kvm03: # #cz7343-kvm.host-telecom.com
@@ -161,15 +163,16 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:6c:83:54"
           interfaces:
-            enp9s0f0:
+            one1:
               mac: "0c:c4:7a:6c:83:54"
               mode: "static"
               ip: "172.16.49.69"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "5.43.225.119"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         osd001: # #cz7343-kvm.host-telecom.com
@@ -177,31 +180,33 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:55:6a:d4"
           interfaces:
-            enp2s0f0:
+            one1:
               mac: "0c:c4:7a:55:6a:d4"
               mode: "static"
               ip: "172.16.49.70"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "185.8.59.243"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         osd002: # #cz7343-kvm.host-telecom.com
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
-          pxe_interface_mac: "0c:c4:7a:55:6a:56"
+          pxe_interface_mac: "0c:c4:7a:55:6a:57"
           interfaces:
-            enp2s0f0:
-              mac: "0c:c4:7a:55:6a:56"
+            one1:
+              mac: "0c:c4:7a:55:6a:57"
               mode: "static"
               ip: "172.16.49.71"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "185.8.59.244"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         osd003: # #cz7343-kvm.host-telecom.com
@@ -209,15 +214,16 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:55:6a:2a"
           interfaces:
-            enp2s0f0:
+            one1:
               mac: "0c:c4:7a:55:6a:2a"
               mode: "static"
               ip: "172.16.49.72"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "185.8.59.245"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         cmp001: # #cz7345-kvm.host-telecom.com
@@ -225,15 +231,16 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:54:a2:5f"
           interfaces:
-            enp2s0f1:
+            one2:
               mac: "0c:c4:7a:54:a2:5f"
               mode: "static"
               ip: "172.16.49.73"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "185.8.59.233"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
         cmp002: # cz7346-kvm.host-telecom.com
@@ -241,15 +248,16 @@
           # hwe_kernel: "hwe-16.04"
           pxe_interface_mac: "0c:c4:7a:54:a0:51"
           interfaces:
-            enp2s0f1:
+            one2:
               mac: "0c:c4:7a:54:a0:51"
               mode: "static"
               ip: "172.16.49.74"
-              subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+              subnet: "172.16.49.64/26" # create it manually... in UI
               gateway: ${_param:deploy_network_gateway}
           power_parameters:
             power_address: "185.8.59.232"
-            power_pass: ==IPMI_PASS==
+            #power_pass: ==IPMI_PASS==
+            power_password: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
 
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail32-released.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail32-released.yaml
index d7209d8..5edef82 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail32-released.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail32-released.yaml
@@ -42,11 +42,11 @@
 
 - description: Temporary WR for correct bridge name according to envoronment templates
   cmd: |
-    #sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
-    #sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+    sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+    sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
     # For 2018.11.0+ :
-    sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
-    sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+    #sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+    #sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 10}
   skip_fail: false
@@ -56,11 +56,11 @@
     set -e;
     set -x;
     . /root/venv-reclass-tools/bin/activate;
-    #reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
-    #reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+    reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+    reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
     # For 2018.11.0+ :
-    reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
-    reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+    #reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+    #reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false