diff --git a/classes/cluster/k8s_ha_contrail/infra/init.yml b/classes/cluster/k8s_ha_contrail/infra/init.yml
index d36c573..750d100 100644
--- a/classes/cluster/k8s_ha_contrail/infra/init.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/init.yml
@@ -1,13 +1,7 @@
-alasses:
-- system.linux.system.single
+classes:
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.ubuntu
-- system.openssh.server.team.lab
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.mcp_qa
-- system.openssh.server.team.k8s_team
-- system.rsyslog.client.single
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/k8s_ha_contrail/init.yml b/classes/cluster/k8s_ha_contrail/init.yml
index 4cfdd17..7ea51c3 100644
--- a/classes/cluster/k8s_ha_contrail/init.yml
+++ b/classes/cluster/k8s_ha_contrail/init.yml
@@ -1,5 +1,10 @@
 classes:
+- system.linux.system.single
 - cluster.k8s_ha_contrail.kubernetes
 - cluster.k8s_ha_contrail.opencontrail
 - cluster.k8s_ha_contrail.infra
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
 - cluster.overrides
diff --git a/classes/cluster/sl_k8s_contrail/infra/init.yml b/classes/cluster/sl_k8s_contrail/infra/init.yml
index 78f83e8..d5009dc 100644
--- a/classes/cluster/sl_k8s_contrail/infra/init.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/init.yml
@@ -1,17 +1,11 @@
 classes:
-- system.linux.system.single
+- service.grafana.collector
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.ubuntu
-- system.openssh.server.team.lab
-- system.openssh.server.team.stacklight
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.mcp_qa
-- system.openssh.server.team.k8s_team
 - system.rsyslog.client.single
 - system.telegraf.agent
 - system.prometheus.collector
-- service.grafana.collector
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/sl_k8s_contrail/init.yml b/classes/cluster/sl_k8s_contrail/init.yml
index 650e6f1..18b57f3 100644
--- a/classes/cluster/sl_k8s_contrail/init.yml
+++ b/classes/cluster/sl_k8s_contrail/init.yml
@@ -1,6 +1,12 @@
 classes:
+- system.linux.system.single
 - cluster.k8s_ha_contrail.kubernetes
 - cluster.k8s_ha_contrail.opencontrail
 - cluster.k8s_ha_contrail.stacklight
 - cluster.k8s_ha_contrail.infra
+- system.openssh.server.team.lab
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
 - cluster.overrides