diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
index 5a7314b..19a5a47 100644
--- a/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
@@ -1,8 +1,3 @@
 classes:
   - cluster.virtual-mcp11-aio-telemetry
-parameters:
-  linux:
-    system:
-      name: cfg01
-      domain: ${_param:cluster_domain}
-      purge_repos: ${_param:linux_system_purge_repos}
+  - cluster.virtual-mcp11-aio.infra.config
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
index cd75b17..eec6f65 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
@@ -1,12 +1,4 @@
 classes:
-- cluster.virtual-mcp11-aio.infra.config
 - cluster.virtual-mcp11-aio-telemetry.openstack
-- cluster.overrides
-parameters:
-  _param:
-    cluster_domain: virtual-mcp11-aio-telemetry.local
-    cluster_name: virtual-mcp11-aio-telemetry
-    reclass_config_master: 192.168.10.90
-    single_address: 172.16.10.90
-    infra_config_address: ${_param:single_address}
-    infra_config_hostname: cfg01
\ No newline at end of file
+- cluster.virtual-mcp11-aio
+- cluster.overrides
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 0d6b569..34a80c0 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -25,6 +25,7 @@
 - system.ceilometer.server.backend.gnocchi
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- cluster.virtual-mcp11-aio.openstack
 parameters:
   _param:
     cluster_public_protocol: http
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 86ac3ee..ae753dc 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.salt.minion.cert.mysql.server
 - system.salt.minion.cert.rabbitmq_server
 - system.linux.system.lowmem
diff --git a/classes/system b/classes/system
index 20e1050..03bd042 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 20e10506579de874f45806d7992c3649fa81842e
+Subproject commit 03bd042f2ef4fb0e9cd86663494445dcabe96120