diff --git a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
index 8f85554..c87e92a 100644
--- a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
+++ b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
@@ -10,7 +10,7 @@
         enp3s0f0:
           role: single_mgm
         enp3s0f1:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
 
     kvm02.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node02
@@ -21,7 +21,7 @@
         eno1:
           role: single_mgm
         eno2:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
 
     kvm03.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node03
@@ -32,7 +32,7 @@
         eno1:
           role: single_mgm
         eno2:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
 
     cmp001.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_compute_node01
@@ -43,9 +43,9 @@
         enp3s0f0:
           role: single_mgm
         enp3s0f1:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
         enp5s0f0:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
         enp5s0f1:
           role: bond2_dpdk_prv
           dpdk_pci: '0000:05:00.1'
@@ -62,9 +62,9 @@
         eno1:
           role: single_mgm
         eth0:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
         eth3:
-          role: bond0_ab_ctl
+          role: bond0_ab_ovs_vlan_ctl
         eth2:
           role: bond2_dpdk_prv
           dpdk_pci: '0000:05:00.1'
diff --git a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
index d5c7a1b..a5b3c1e 100644
--- a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
+++ b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
@@ -1,12 +1,25 @@
 nodes:
+    cfg01.mcp11-ovs-dpdk.local:
+      reclass_storage_name: infra_config_node01
+      roles:
+      - infra_config
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
+
     kvm01.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node01
       roles:
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: single_vlan_ctl
 
     kvm02.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node02
@@ -14,8 +27,10 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: single_vlan_ctl
 
     kvm03.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node03
@@ -23,8 +38,10 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: single_vlan_ctl
 
     cid01.mcp11-ovs-dpdk.local:
       reclass_storage_name: cicd_control_node01
@@ -33,7 +50,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     cid02.mcp11-ovs-dpdk.local:
       reclass_storage_name: cicd_control_node02
@@ -42,7 +61,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     cid03.mcp11-ovs-dpdk.local:
       reclass_storage_name: cicd_control_node03
@@ -51,7 +72,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     ctl01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node01
@@ -62,7 +85,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     ctl02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node02
@@ -72,7 +97,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     ctl03.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node03
@@ -82,7 +109,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     dbs01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_database_node01
@@ -92,7 +121,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     dbs02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_database_node02
@@ -102,7 +133,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     dbs03.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_database_node03
@@ -112,7 +145,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     msg01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_message_queue_node01
@@ -121,7 +156,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     msg02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_message_queue_node02
@@ -130,7 +167,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     msg03.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_message_queue_node03
@@ -139,7 +178,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mdb01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_telemetry_node01
@@ -148,7 +189,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mdb02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_telemetry_node02
@@ -157,7 +200,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mdb03.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_telemetry_node03
@@ -166,7 +211,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     prx01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_proxy_node01
@@ -175,7 +222,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     prx02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_proxy_node02
@@ -184,7 +233,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mtr01.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_telemetry_node01
@@ -193,7 +244,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mtr02.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_telemetry_node02
@@ -202,7 +255,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     mtr03.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_telemetry_node03
@@ -211,7 +266,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     log01.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_log_node01
@@ -220,7 +277,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     log02.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_log_node02
@@ -229,7 +288,9 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     log03.mcp11-ovs-dpdk.local:
       reclass_storage_name: stacklight_log_node03
@@ -238,19 +299,21 @@
       - linux_system_codename_xenial
       interfaces:
         ens3:
-          role: single_ctl
+          role: single_dhcp
+        ens4:
+          role: single_vlan_ctl
 
     # Generator-based computes. For compatibility only
-    cmp000.mcp11-ovs-dpdk.local:
+    cmp<<count>>.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_compute_rack01
       roles:
       - openstack_compute
       - linux_system_codename_xenial
       interfaces:
-        #ens3:
-        #  role: single_mgm
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: bond0_ab_ovs_vxlan_ctl_mesh
         ens5:
           role: bond0_ab_ovs_vxlan_ctl_mesh
         ens6:
@@ -262,10 +325,10 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        #ens3:
-        #  role: single_mgm
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: bond0_ab_ovs_vxlan_ctl_mesh
         ens5:
           role: bond0_ab_ovs_vxlan_ctl_mesh
         ens6:
@@ -277,10 +340,10 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        #ens3:
-        #  role: single_mgm
+        ens3:
+          role: single_dhcp
         ens4:
-          role: single_ctl
+          role: bond0_ab_ovs_vxlan_ctl_mesh
         ens5:
           role: bond0_ab_ovs_vxlan_ctl_mesh
         ens6:
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/bond0_ab_ctl" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl"
similarity index 100%
rename from "tcp_tests/environment/environment_template/\173\043 interfaces \043\175/bond0_ab_ctl"
rename to "tcp_tests/environment/environment_template/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl"
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_dhcp" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_dhcp"
new file mode 100644
index 0000000..107b523
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_dhcp"
@@ -0,0 +1,17 @@
+{#- Management (admin) network. For nodes where deploy address must be configured as static (at least cfg*) #}
+{#- Provides:                         #}
+{#-   br_mgm (linux bridge) + address #}
+{#- Requires:                         #}
+{#-   _param:deploy_address         #}
+{#-   _param:deploy_network_netmask         #}
+{#-   _param:deploy_network_gateway         #}
+{#-   _param:dns_server01         #}
+{#-   _param:dns_server02         #}
+
+              # {{ interfaces_role }}
+              {%- set interface_name = interfaces.keys()[0] %}
+              {{ interface_name }}:
+                enabled: true
+                type: eth
+                proto: dhcp
+                name: {{ interface_name }}
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_vlan_ctl" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_vlan_ctl"
new file mode 100644
index 0000000..db00e14
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/single_vlan_ctl"
@@ -0,0 +1,42 @@
+{#- Control network. For control plane nodes #}
+{#- Provides:                         #}
+{#-   br_ctl (linux bridge) + address #}
+{#-   _param:keepalived_vip_interface = 'br_ctl' #}
+{#- Requires:                         #}
+{#-   _param:single_address         #}
+{#-   _param:control_network_netmask         #}
+{#-   _param:control_vlan         #}
+{#-   _param:dns_server01         #}
+{#-   _param:dns_server02         #}
+
+              # {{ interfaces_role }}
+              {%- set interface_name = interfaces.keys()[0] %}
+              {{ interface_name }}:
+                enabled: true
+                name: {{ interface_name }}
+                proto: manual
+                type: eth
+                ipflush_onchange: true
+              br_ctl:
+                enabled: true
+                address: ${_param:_esc}{_param:single_address}
+                netmask: ${_param:_esc}{_param:control_network_netmask}
+                proto: static
+                type: bridge
+                name_servers:
+                - ${_param:_esc}{_param:dns_server01}
+                - ${_param:_esc}{_param:dns_server02}
+                use_interfaces:
+                - {{ interface_name }}.${_param:_esc}{_param:control_vlan}
+                require_interfaces:
+                - {{ interface_name }}.${_param:_esc}{_param:control_vlan}
+              {{ interface_name }}.control_vlan:
+                name: {{ interface_name }}.${_param:_esc}{_param:control_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - {{ interface_name }}
+                require_interfaces:
+                - {{ interface_name }}
+{%- set _ = params.update({'keepalived_vip_interface': 'br_ctl'}) %}
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/infra_config" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/infra_config"
index 310b092..95b64b6 100644
--- "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/infra_config"
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/infra_config"
@@ -6,4 +6,6 @@
         <reclass_storage_node_name>:
           classes:
 #}
-          - cluster.${_param:cluster_name}.infra.config
\ No newline at end of file
+          - cluster.${_param:cluster_name}.infra.config
+          - environment.{{ cookiecutter._env_name }}.reclass_datasource_local
+          - environment.{{ cookiecutter._env_name }}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
index feffa64..b2588b8 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
@@ -7,6 +7,7 @@
     storage:
       node:
       {%- for inventory_node_name, node in nodes.items()|sort %}
+        {%- set node_name = inventory_node_name.split('.')[0] %}
         {{ node['reclass_storage_name'] }}:
         {# 'params' dict object is dynamically generated from 'roles' to add on the node #}
         {%- set params = {} %}
@@ -22,7 +23,8 @@
             {{ param_name }}: {{ param }}
           {%- endfor %}
         {%- endif %}
-
+          name: {{ node_name }}
+          domain: ${_param:cluster_domain}
       {%- endfor %}
 
 classes:
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/reclass_datasource_local.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/reclass_datasource_local.yml"
new file mode 100644
index 0000000..1c334f7
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/reclass_datasource_local.yml"
@@ -0,0 +1,7 @@
+# Switch to the local metadata storage instead of git
+parameters:
+# local storage
+  reclass:
+    storage:
+      data_source:
+        engine: local
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
index 478e9dd..3da0df6 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
@@ -23,7 +23,7 @@
     mkdir -p /srv/salt/reclass/classes/cluster/
     mkdir -p /srv/salt/reclass/classes/system/
     mkdir -p /srv/salt/reclass/classes/service/
-    mkdir -p /srv/salt/reclass/nodes/
+    mkdir -p /srv/salt/reclass/nodes/_generated
 
     {%- set CONTEXT_PATH = '/tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml' %}
 
@@ -63,23 +63,11 @@
     export GIT_SSL_NO_VERIFY=true; git clone https://gerrit.mcp.mirantis.net/salt-models/reclass-system /srv/salt/reclass/classes/system/
 
     # Create the cfg01 node and disable checkouting the model from remote repository
-    cat << 'EOF' >> /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml
+    cat << 'EOF' >> /srv/salt/reclass/nodes/_generated/{{ HOSTNAME_CFG01 }}.yml
     classes:
     - cluster.{{ LAB_CONFIG_NAME }}.infra.config
-    parameters:
-      _param:
-        linux_system_codename: xenial
-        reclass_data_revision: master
-      linux:
-        system:
-          name: cfg01
-          domain: {{ DOMAIN_NAME }}
-    # local storage
-      reclass:
-        storage:
-          data_source:
-            engine: local
-    EOF
+    - environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}.reclass_datasource_local
+    - environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}
 
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
@@ -92,23 +80,35 @@
     pip install git+https://github.com/dis-xcom/reclass-tools;
 
     # Enable 'root' user
-    reclass-tools add-key classes system.openssh.server.team.lab /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml --merge
+    reclass-tools add-key classes system.openssh.server.team.all /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml --merge
 
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
   skip_fail: false
 
-
-{{ SHARED.MACRO_CONFIGURE_RECLASS(FORMULA_SERVICES='"linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "powerdns" "glusterfs" "xtrabackup"') }}
-
-
-- description: Upload 'environment' to {{ HOSTNAME_GTW01 }}
+- description: "[EXPERIMENTAL] Upload 'environment' to {{ HOSTNAME_CFG01 }}"
   upload:
     local_path: {{ config.salt_deploy.environment_template_dir }}
     remote_path: /tmp/environment/
   node_name: {{ HOSTNAME_CFG01 }}
   skip_fail: false
 
+- description: "[EXPERIMENTAL] Remove linux.network.interface object from the cluster/system models and use fixed 'environment' model instead"
+  cmd: |
+    apt-get -y install python-virtualenv python-pip build-essential python-dev libssl-dev;
+    pip install git+https://github.com/dis-xcom/reclass-tools;
+    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/cluster/;
+    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/system/;
+    reclass-tools del-key parameters.linux.network.interface /usr/share/salt-formulas/reclass/;
+
+    #if ! reclass-tools get-key 'classes' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml | grep -q "environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}$"; then
+    #  reclass-tools add-key 'classes' 'environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml --merge ;
+    #fi;
+
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
 - description: "[EXPERIMENTAL] Create environment model for virtual environment"
   cmd: |
     set -e;
@@ -122,21 +122,7 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: "[EXPERIMENTAL] Remove linux.network.interface object from the cluster/system models and use fixed 'environment' model instead"
-  cmd: |
-    apt-get -y install python-virtualenv python-pip build-essential python-dev libssl-dev;
-    pip install git+https://github.com/dis-xcom/reclass-tools;
-    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/cluster/;
-    reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/system/;
-    reclass-tools del-key parameters.linux.network.interface /usr/share/salt-formulas/reclass/;
-
-    if ! reclass-tools get-key 'classes' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml | grep -q "environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}$"; then
-      reclass-tools add-key 'classes' 'environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}' /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml --merge ;
-    fi;
-
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
+{{ SHARED.MACRO_CONFIGURE_RECLASS(FORMULA_SERVICES='"linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "powerdns" "glusterfs" "xtrabackup"') }}
 
 {{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
 
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
index 8c75753..8cb2c2d 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
@@ -37,7 +37,7 @@
    # Prepare network connection
    - sudo ifup ens3
    #- sudo route add default gw {gateway} {interface_name}
-   - sudo ifup ens4
+   #- sudo ifup ens4
 
    # Create swap
    - fallocate -l 4G /swapfile
@@ -85,8 +85,6 @@
      content: |
           auto ens3
           iface ens3 inet dhcp
-          auto ens4
-          iface ens4 inet dhcp
 
    - path: /root/.ssh/config
      owner: root:root
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
index 410a639..677c392 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
@@ -39,7 +39,7 @@
    # Prepare network connection
    - sudo ifup ens3
    #- sudo route add default gw {gateway} {interface_name}
-   - sudo ifup ens4
+   #- sudo ifup ens4
 
    # Create swap
    - fallocate -l 4G /swapfile
@@ -89,6 +89,4 @@
      content: |
           auto ens3
           iface ens3 inet dhcp
-          auto ens4
-          iface ens4 inet dhcp
 
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