diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
index 7221945..35309f0 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay.yaml
@@ -288,23 +288,23 @@
           external: external-pool01
 
         l2_network_devices:
-          private:
-            address_pool: private-pool01
-            dhcp: true
-
           admin:
             address_pool: admin-pool01
             dhcp: true
             forward:
               mode: nat
 
-          tenant:
-            address_pool: tenant-pool01
-            dhcp: true
+          private:
+            address_pool: private-pool01
+            dhcp: false
+
+          #tenant:
+          #  address_pool: tenant-pool01
+          #  dhcp: false
 
           external:
             address_pool: external-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: nat
 
@@ -362,97 +362,6 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
-
-              interfaces: &cid_interfaces
-                - label: ens3
-                  l2_network_device: private
-                  interface_model: *interface_model
-                - label: ens4
-                  l2_network_device: admin
-                  interface_model: *interface_model
-              network_config: &cid_network_config
-                ens3:
-                  networks:
-                    - private
-                ens4:
-                  networks:
-                    - admin
-
-#          - name: {{ HOSTNAME_CID02 }}
-#            role: salt_minion
-#            params:
-##              vcpu: !os_env SLAVE_NODE_CPU, 2
-#              memory: !os_env SLAVE_NODE_MEMORY, 6144
-#              boot:
-#                - hd
-#              cloud_init_volume_name: iso
-#              cloud_init_iface_up: ens4
-#              volumes:
-#                - name: system
-#                  capacity: !os_env NODE_VOLUME_SIZE, 150
-#                  backing_store: cloudimage1604
-#                  format: qcow2
-#                - name: iso  # Volume with name 'iso' will be used
-#                             # for store image with cloud-init metadata.
-#                  capacity: 1
-#                  format: raw
-#                  device: cdrom
-#                  bus: ide
-#                  cloudinit_meta_data: *cloudinit_meta_data
-#                  cloudinit_user_data: *cloudinit_user_data_cicd
-#
-#              interfaces: *cid_interfaces
-#              network_config: *cid_network_config
-
-#          - name: {{ HOSTNAME_CID03 }}
-#            role: salt_minion
-#            params:
-#              vcpu: !os_env SLAVE_NODE_CPU, 2
-#              memory: !os_env SLAVE_NODE_MEMORY, 6144
-#              boot:
-#                - hd
-#              cloud_init_volume_name: iso
-#              cloud_init_iface_up: ens4
-#              volumes:
-#                - name: system
-#                  capacity: !os_env NODE_VOLUME_SIZE, 150
-#                  backing_store: cloudimage1604
-#                  format: qcow2
-#                - name: iso  # Volume with name 'iso' will be used
-#                             # for store image with cloud-init metadata.
-#                  capacity: 1
-#                  format: raw
-#                  device: cdrom
-#                  bus: ide
-#                  cloudinit_meta_data: *cloudinit_meta_data
-#                  cloudinit_user_data: *cloudinit_user_data_cicd
-#
-#              interfaces: *cid_interfaces
-#              network_config: *cid_network_config
-
-          # KVM* nodes required for services like glusterfs.server
-          - name: {{ HOSTNAME_KVM01 }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 1
-              memory: !os_env SLAVE_NODE_MEMORY, 2048
-              boot:
-                - hd
-              cloud_init_volume_name: iso
               cloud_init_iface_up: ens3
               volumes:
                 - name: system
@@ -483,6 +392,85 @@
                   networks:
                     - private
 
+#          - name: {{ HOSTNAME_CID02 }}
+#            role: salt_minion
+#            params:
+##              vcpu: !os_env SLAVE_NODE_CPU, 2
+#              memory: !os_env SLAVE_NODE_MEMORY, 6144
+#              boot:
+#                - hd
+#              cloud_init_volume_name: iso
+#              cloud_init_iface_up: ens3
+#              volumes:
+#                - name: system
+#                  capacity: !os_env NODE_VOLUME_SIZE, 150
+#                  backing_store: cloudimage1604
+#                  format: qcow2
+#                - name: iso  # Volume with name 'iso' will be used
+#                             # for store image with cloud-init metadata.
+#                  capacity: 1
+#                  format: raw
+#                  device: cdrom
+#                  bus: ide
+#                  cloudinit_meta_data: *cloudinit_meta_data
+#                  cloudinit_user_data: *cloudinit_user_data_1604
+#
+#              interfaces: *interfaces
+#              network_config: *network_config
+
+#          - name: {{ HOSTNAME_CID03 }}
+#            role: salt_minion
+#            params:
+#              vcpu: !os_env SLAVE_NODE_CPU, 2
+#              memory: !os_env SLAVE_NODE_MEMORY, 6144
+#              boot:
+#                - hd
+#              cloud_init_volume_name: iso
+#              cloud_init_iface_up: ens3
+#              volumes:
+#                - name: system
+#                  capacity: !os_env NODE_VOLUME_SIZE, 150
+#                  backing_store: cloudimage1604
+#                  format: qcow2
+#                - name: iso  # Volume with name 'iso' will be used
+#                             # for store image with cloud-init metadata.
+#                  capacity: 1
+#                  format: raw
+#                  device: cdrom
+#                  bus: ide
+#                  cloudinit_meta_data: *cloudinit_meta_data
+#                  cloudinit_user_data: *cloudinit_user_data_1604
+#
+#              interfaces: *interfaces
+#              network_config: *network_config
+
+          # KVM* nodes required for services like glusterfs.server
+          - name: {{ HOSTNAME_KVM01 }}
+            role: salt_minion
+            params:
+              vcpu: !os_env SLAVE_NODE_CPU, 1
+              memory: !os_env SLAVE_NODE_MEMORY, 2048
+              boot:
+                - hd
+              cloud_init_volume_name: iso
+              cloud_init_iface_up: ens3
+              volumes:
+                - name: system
+                  capacity: !os_env NODE_VOLUME_SIZE, 150
+                  backing_store: cloudimage1604
+                  format: qcow2
+                - name: iso  # Volume with name 'iso' will be used
+                             # for store image with cloud-init metadata.
+                  capacity: 1
+                  format: raw
+                  device: cdrom
+                  bus: ide
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
+
+              interfaces: *interfaces
+              network_config: *network_config
+
           - name: {{ HOSTNAME_KVM02 }}
             role: salt_minion
             params:
@@ -543,7 +531,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -556,10 +544,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
           - name: {{ HOSTNAME_DBS02 }}
             role: salt_minion
@@ -569,7 +557,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -582,10 +570,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
           - name: {{ HOSTNAME_DBS03 }}
             role: salt_minion
@@ -595,7 +583,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -608,10 +596,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
           - name: {{ HOSTNAME_MSG01 }}
             role: salt_minion
@@ -621,7 +609,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -634,10 +622,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
 #          - name: {{ HOSTNAME_MSG02 }}
 #            role: salt_minion
@@ -647,7 +635,7 @@
 #              boot:
 #                - hd
 #              cloud_init_volume_name: iso
-#              cloud_init_iface_up: ens4
+#              cloud_init_iface_up: ens3
 #              volumes:
 #                - name: system
 #                  capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -660,10 +648,10 @@
 #                  device: cdrom
 #                  bus: ide
 #                  cloudinit_meta_data: *cloudinit_meta_data
-#                  cloudinit_user_data: *cloudinit_user_data_cicd
+#                  cloudinit_user_data: *cloudinit_user_data_1604
 #
-#              interfaces: *cid_interfaces
-#              network_config: *cid_network_config
+#              interfaces: *interfaces
+#              network_config: *network_config
 
 #          - name: {{ HOSTNAME_MSG03 }}
 #            role: salt_minion
@@ -673,7 +661,7 @@
 #              boot:
 #                - hd
 #              cloud_init_volume_name: iso
-#              cloud_init_iface_up: ens4
+#              cloud_init_iface_up: ens3
 #              volumes:
 #                - name: system
 #                  capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -686,10 +674,10 @@
 #                  device: cdrom
 #                  bus: ide
 #                  cloudinit_meta_data: *cloudinit_meta_data
-#                  cloudinit_user_data: *cloudinit_user_data_cicd
+#                  cloudinit_user_data: *cloudinit_user_data_1604
 #
-#              interfaces: *cid_interfaces
-#              network_config: *cid_network_config
+#              interfaces: *interfaces
+#              network_config: *network_config
 
           - name: {{ HOSTNAME_CTL01 }}
             role: salt_minion
@@ -699,7 +687,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -715,10 +703,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
           - name: {{ HOSTNAME_CTL02 }}
             role: salt_minion
@@ -728,7 +716,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -744,10 +732,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
 #          - name: {{ HOSTNAME_CTL03 }}
 #            role: salt_minion
@@ -757,7 +745,7 @@
 #              boot:
 #                - hd
 #              cloud_init_volume_name: iso
-#              cloud_init_iface_up: ens4
+#              cloud_init_iface_up: ens3
 #              volumes:
 #                - name: system
 #                  capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -773,10 +761,10 @@
 #                  device: cdrom
 #                  bus: ide
 #                  cloudinit_meta_data: *cloudinit_meta_data
-#                  cloudinit_user_data: *cloudinit_user_data_cicd
+#                  cloudinit_user_data: *cloudinit_user_data_1604
 #
-#              interfaces: *cid_interfaces
-#              network_config: *cid_network_config
+#              interfaces: *interfaces
+#              network_config: *network_config
 
           - name: {{ HOSTNAME_PRX01 }}
             role: salt_minion
@@ -786,7 +774,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: ens4
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -802,10 +790,10 @@
                   device: cdrom
                   bus: ide
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cicd
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
-              interfaces: *cid_interfaces
-              network_config: *cid_network_config
+              interfaces: *interfaces
+              network_config: *network_config
 
           - name: {{ HOSTNAME_CMP01 }}
             role: salt_minion
@@ -839,7 +827,7 @@
                   l2_network_device: private
                   interface_model: *interface_model
                 - label: ens5
-                  l2_network_device: tenant
+                  l2_network_device: private
                   interface_model: *interface_model
                 - label: ens6
                   l2_network_device: external
@@ -853,7 +841,7 @@
                     - private
                 ens5:
                   networks:
-                    - tenant
+                    - private
                 ens6:
                   networks:
                     - external