diff --git a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
index 65d402f..d7ed663 100644
--- a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
+++ b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
@@ -143,6 +143,14 @@
   retry: {count: 1, delay: 1}
   skip_fail: false
 
+- description: Configure salt adoptors on cfg01
+  cmd: |
+    ln -s /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py /usr/local/sbin/reclass-salt;
+    chmod +x /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 1}
+  skip_fail: false
+
 - description: Restart salt-master service
   cmd: |
      systemctl restart salt-master; sleep 60
@@ -175,14 +183,6 @@
   skip_fail: true
 
 
-- description: Configure salt adoptors on cfg01
-  cmd: |
-    ln -s /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py /usr/local/sbin/reclass-salt;
-    chmod +x /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 1}
-  skip_fail: false
-
 
 # Prepare salt services and nodes settings
 - description: Run 'linux' formula on cfg01
diff --git a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/underlay.yaml b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/underlay.yaml
index 0c0910e..c14fa4e 100644
--- a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/underlay.yaml
+++ b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/underlay.yaml
@@ -10,7 +10,7 @@
  - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
  - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
  - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
- - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
+ - &cloudinit_user_data {{ CLOUDINIT_USER_DATA_1604 }}
 
 {% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'mk24_lab_ovs_dvr_vlan_bm') + '.local' %}
 {% set HOSTNAME_KVM01 = os_env('HOSTNAME_KVM01', 'kvm01.' + DOMAIN_NAME) %}
@@ -135,7 +135,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
@@ -178,7 +178,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
@@ -221,7 +221,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
@@ -264,7 +264,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
@@ -307,7 +307,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
@@ -350,7 +350,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp8s0f1
diff --git a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
index cd08c85..debafdf 100644
--- a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
@@ -10,7 +10,7 @@
  - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
  - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
  - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
- - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
+ - &cloudinit_user_data {{ CLOUDINIT_USER_DATA_1604 }}
 
 {% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'physical_mcp11_dvr') + '.local' %}
 {% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
@@ -134,7 +134,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -184,7 +184,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -233,7 +233,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -283,7 +283,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -333,7 +333,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -383,7 +383,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -432,7 +432,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
index 08ecd01..9ec6644 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
@@ -10,7 +10,7 @@
  - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
  - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
  - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
- - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
+ - &cloudinit_user_data {{ CLOUDINIT_USER_DATA_1604 }}
 
 {% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'physical_mcp11_ovs_dpdk') + '.local' %}
 {% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
@@ -134,7 +134,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp3s0f0
@@ -180,7 +180,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eno1
@@ -226,7 +226,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eno1
@@ -273,7 +273,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp3s0f0
@@ -329,7 +329,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eno1
@@ -385,7 +385,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp2s0f0
@@ -431,7 +431,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: enp2s0f0