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