diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index ba54ac1..49e3cc2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -19,6 +19,10 @@
 - system.keystone.client.service.designate
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.cicd_control_cluster
 - cluster.virtual-mcp-ocata-cicd.openstack.proxy
 - cluster.virtual-mcp-ocata-cicd.stacklight.proxy
 - cluster.virtual-mcp-ocata-cicd.infra
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 2852360..21e5949 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -20,6 +20,9 @@
 - system.keystone.client.service.designate
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp-ocata-dvr.openstack.proxy
 - cluster.virtual-mcp-ocata-dvr.stacklight.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 7204cba..a719b3e 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -20,6 +20,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
 - cluster.virtual-mcp-ocata-ovs.openstack.proxy
 - cluster.virtual-mcp-ocata-ovs.stacklight.proxy
 - cluster.virtual-mcp-ocata-ovs
@@ -163,3 +166,4 @@
           classes:
           - system.influxdb.server.single
           - system.influxdb.database.stacklight
+            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index 9b92254..bd42fe8 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -15,6 +15,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
 - cluster.virtual-mcp05-dvr.openstack.proxy
 - cluster.virtual-mcp05-dvr.stacklight.proxy
 - cluster.virtual-mcp05-dvr
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 1b8b3d2..1b7a1c4 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -16,6 +16,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - system.reclass.storage.system.stacklight_server_cluster
 - cluster.virtual-mcp10-contrail.openstack.proxy
 - cluster.virtual-mcp10-contrail.stacklight.proxy
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index 7aa4041..829635b 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -15,6 +15,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp10-dvr.openstack.proxy
 - cluster.virtual-mcp10-dvr.stacklight.proxy
 - cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index 35cda38..568e9e5 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -15,6 +15,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp10-ovs.openstack.proxy
 - cluster.virtual-mcp10-ovs.stacklight.proxy
 - cluster.virtual-mcp10-ovs
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index 62fd211..ec1d55b 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -30,6 +30,9 @@
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
 - system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp11-contrail-nfv.openstack.proxy
 - cluster.virtual-mcp11-contrail-nfv.stacklight.proxy
 - cluster.virtual-mcp11-contrail-nfv
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index e36368a..ff26926 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -30,6 +30,9 @@
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
 - system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp11-contrail.openstack.proxy
 - cluster.virtual-mcp11-contrail.stacklight.proxy
 - cluster.virtual-mcp11-contrail
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index cf0a00f..a890b81 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -19,6 +19,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp11-dvr.openstack.proxy
 - cluster.virtual-mcp11-dvr.stacklight.proxy
 - cluster.virtual-mcp11-dvr
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 49dae30..6bda643 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -19,6 +19,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp11-ovs-dpdk.openstack.proxy
 - cluster.virtual-mcp11-ovs-dpdk.stacklight.proxy
 - cluster.virtual-mcp11-ovs-dpdk
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index 213c73d..529527a 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -20,7 +20,10 @@
 - system.keystone.client.service.nova-placement
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_baremetal_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklight_server_cluster
 - cluster.virtual-mcp11-ovs-ironic.openstack.proxy
 - cluster.virtual-mcp11-ovs-ironic.stacklight.proxy
 - cluster.virtual-mcp11-ovs-ironic
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 15443b3..540ccee 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -18,6 +18,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.virtual-mcp11-ovs.openstack.proxy
 - cluster.virtual-mcp11-ovs.stacklight.proxy
 - cluster.virtual-mcp11-ovs
diff --git a/nodes/cfg01.virtual-mcp-ocata-cicd.local.yml b/nodes/cfg01.virtual-mcp-ocata-cicd.local.yml
new file mode 100644
index 0000000..671695d
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp-ocata-cicd.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp-ocata-cicd.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp-ocata-cicd.local
diff --git a/nodes/cfg01.virtual-mcp-ocata-dvr.local.yml b/nodes/cfg01.virtual-mcp-ocata-dvr.local.yml
new file mode 100644
index 0000000..7bac15f
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp-ocata-dvr.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp-ocata-dvr.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp-ocata-dvr.local
diff --git a/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml b/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
new file mode 100644
index 0000000..43202d6
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp-ocata-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp-ocata-ovs.local
diff --git a/nodes/cfg01.virtual-mcp05-dvr.local.yml b/nodes/cfg01.virtual-mcp05-dvr.local.yml
new file mode 100755
index 0000000..5491179
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp05-dvr.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp05-dvr.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp05-dvr.local
diff --git a/nodes/cfg01.virtual-mcp05-ovs.local.yml b/nodes/cfg01.virtual-mcp05-ovs.local.yml
new file mode 100755
index 0000000..5b500f2
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp05-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp05-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp05-ovs.local
diff --git a/nodes/cfg01.virtual-mcp10-contrail.local.yml b/nodes/cfg01.virtual-mcp10-contrail.local.yml
new file mode 100755
index 0000000..fb2c57c
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-contrail.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-contrail.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-contrail.local
diff --git a/nodes/cfg01.virtual-mcp10-dvr.local.yml b/nodes/cfg01.virtual-mcp10-dvr.local.yml
new file mode 100755
index 0000000..14cef32
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-dvr.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-dvr.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-dvr.local
diff --git a/nodes/cfg01.virtual-mcp10-ovs.local.yml b/nodes/cfg01.virtual-mcp10-ovs.local.yml
new file mode 100755
index 0000000..d38969f
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-ovs.local
diff --git a/nodes/cfg01.virtual-mcp11-aio.local.yml b/nodes/cfg01.virtual-mcp11-aio.local.yml
new file mode 100644
index 0000000..88f3267
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-aio.local.yml
@@ -0,0 +1,6 @@
+classes:
+- system.linux.system.single
+- cluster.virtual-mcp11-aio.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
diff --git a/nodes/cfg01.virtual-mcp11-contrail-nfv.local.yml b/nodes/cfg01.virtual-mcp11-contrail-nfv.local.yml
new file mode 100644
index 0000000..911fdcc
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-contrail-nfv.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp11-contrail-nfv.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-contrail-nfv.local
diff --git a/nodes/cfg01.virtual-mcp11-contrail.local.yml b/nodes/cfg01.virtual-mcp11-contrail.local.yml
new file mode 100644
index 0000000..a61f892
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-contrail.local.yml
@@ -0,0 +1,11 @@
+classes:
+- cluster.virtual-mcp11-contrail.infra.config
+- cluster.virtual-mcp11-contrail.stacklight.proxy
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-contrail.local
diff --git a/nodes/cfg01.virtual-mcp11-dvr.local.yml b/nodes/cfg01.virtual-mcp11-dvr.local.yml
new file mode 100644
index 0000000..d7bac28
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-dvr.local.yml
@@ -0,0 +1,11 @@
+classes:
+- cluster.virtual-mcp11-dvr.infra.config
+- cluster.virtual-mcp11-dvr.stacklight.proxy
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-dvr.local
diff --git a/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml b/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml
new file mode 100644
index 0000000..e972393
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp11-k8s-calico-minimal.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-k8s-calico-minimal.local
diff --git a/nodes/cfg01.virtual-mcp11-k8s-calico.local.yml b/nodes/cfg01.virtual-mcp11-k8s-calico.local.yml
new file mode 100644
index 0000000..289bbfc
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-k8s-calico.local.yml
@@ -0,0 +1,11 @@
+classes:
+- cluster.virtual-mcp11-k8s-calico.infra.config
+- cluster.virtual-mcp11-k8s-calico.stacklight.proxy
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-k8s-calico.local
diff --git a/nodes/cfg01.virtual-mcp11-k8s-contrail.local.yml b/nodes/cfg01.virtual-mcp11-k8s-contrail.local.yml
new file mode 100644
index 0000000..39d9783
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-k8s-contrail.local.yml
@@ -0,0 +1,8 @@
+classes:
+- cluster.virtual-mcp11-k8s-contrail.infra.config
+- cluster.virtual-mcp11-k8s-contrail.stacklight.proxy
+parameters:
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-k8s-contrail.local
diff --git a/nodes/cfg01.virtual-mcp11-ovs-dpdk.local.yml b/nodes/cfg01.virtual-mcp11-ovs-dpdk.local.yml
new file mode 100644
index 0000000..dd5440b
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-ovs-dpdk.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp11-ovs-dpdk.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-ovs-dpdk.local
diff --git a/nodes/cfg01.virtual-mcp11-ovs-ironic.local.yml b/nodes/cfg01.virtual-mcp11-ovs-ironic.local.yml
new file mode 100644
index 0000000..584adae
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-ovs-ironic.local.yml
@@ -0,0 +1,18 @@
+classes:
+- cluster.virtual-mcp11-ovs-ironic.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      domain: virtual-mcp11-ovs-ironic.local
+      name: cfg01
+  salt:
+    master:
+      environment:
+        prd:
+          formula:
+            baremetal_simulator:
+              name: salt-formula-baremetal-simulator
+              source: pkg
diff --git a/nodes/cfg01.virtual-mcp11-ovs.local.yml b/nodes/cfg01.virtual-mcp11-ovs.local.yml
new file mode 100644
index 0000000..1b71d63
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp11-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp11-ovs.local