diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
index 0ed5041..572fec5 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
@@ -6,7 +6,7 @@
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.k8s-ha-calico-flannel-virtlet.infra
+- cluster.k8s-ha-calico-flannel-virtlet
 parameters:
   _param:
     salt_master_base_environment: prd
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
index 53d7a0d..eed54f4 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
@@ -9,8 +9,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.salt-formulas
 - system.openssh.server.team.all
-- cluster.k8s-ha-calico-flannel-virtlet.kubernetes
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
new file mode 100644
index 0000000..dc7854d
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.defaults
+- system.linux.network.dynamic_hosts
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes
+- cluster.k8s-ha-calico-flannel-virtlet.infra
+- cluster.overrides
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index 1b781a2..b44d596 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.network.hosts
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.common
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.networking.virtual
-- cluster.k8s-ha-calico-flannel-virtlet.infra
+- cluster.k8s-ha-calico-flannel-virtlet
 
 parameters:
   kubernetes:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index e2f9c30..dcef5c1 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -9,7 +9,7 @@
 - system.kubernetes.control.roles.genie-pod-patch
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.common
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.networking.virtual
-- cluster.k8s-ha-calico-flannel-virtlet.infra
+- cluster.k8s-ha-calico-flannel-virtlet
 parameters:
   _param:
     keepalived_k8s_apiserver_vip_interface: ${_param:control_interface}
diff --git a/classes/cluster/k8s-ha-calico/infra/config.yml b/classes/cluster/k8s-ha-calico/infra/config.yml
index d582161..b3424c3 100644
--- a/classes/cluster/k8s-ha-calico/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico/infra/config.yml
@@ -6,7 +6,7 @@
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.k8s-ha-calico.infra
+- cluster.k8s-ha-calico
 parameters:
   _param:
     salt_master_base_environment: prd
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index 26fcf36..8b0efc6 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -9,8 +9,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.salt-formulas
 - system.openssh.server.team.all
-- cluster.k8s-ha-calico.kubernetes
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/k8s-ha-calico/init.yml b/classes/cluster/k8s-ha-calico/init.yml
new file mode 100644
index 0000000..2b82246
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.defaults
+- system.linux.network.dynamic_hosts
+- cluster.k8s-ha-calico.kubernetes
+- cluster.k8s-ha-calico.infra
+- cluster.overrides
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index a82e22c..d99d0d3 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -2,8 +2,7 @@
 - system.linux.network.hosts
 - cluster.k8s-ha-calico.kubernetes.common
 - cluster.k8s-ha-calico.kubernetes.networking.virtual
-- cluster.k8s-ha-calico.infra
-
+- cluster.k8s-ha-calico
 parameters:
   kubernetes:
     pool:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index ba5f7c0..66289a5 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -8,7 +8,7 @@
 - system.kubernetes.control.roles.cluster-admin
 - cluster.k8s-ha-calico.kubernetes.common
 - cluster.k8s-ha-calico.kubernetes.networking.virtual
-- cluster.k8s-ha-calico.infra
+- cluster.k8s-ha-calico
 parameters:
   _param:
     keepalived_k8s_apiserver_vip_interface: ${_param:control_interface}