diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index fad454e..d385985 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -1,11 +1,3 @@
-classes:
-- system.linux.system.single
-- system.rsyslog.client.single
-- system.linux.system.haveged
-- system.linux.system.prompt
-- system.linux.system.motd.dynamic
-- system.openssh.server.team.all
-
 parameters:
   _param:
     cluster_domain: drivetrain-ha-clusters.local
diff --git a/classes/cluster/drivetrain-ha-clusters/init.yml b/classes/cluster/drivetrain-ha-clusters/init.yml
index 11369f6..aa9cb9b 100644
--- a/classes/cluster/drivetrain-ha-clusters/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/init.yml
@@ -4,11 +4,7 @@
   - system.linux.system.haveged
   - system.linux.system.prompt
   - system.linux.system.motd.dynamic
-  - system.openssh.server.team.lab
-  - system.openssh.server.team.tcpcloud
-  - system.openssh.server.team.stacklight
-  - system.openssh.server.team.mcp_qa
-  - system.openssh.server.team.oss_team
+  - system.openssh.server.team.all
   - cluster.drivetrain-ha.infra
   - cluster.drivetrain-ha.cicd.control
   - cluster.overrides
diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index af6cab1..0b205e5 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -1,11 +1,3 @@
-classes:
-- system.linux.system.single
-- system.rsyslog.client.single
-- system.linux.system.haveged
-- system.linux.system.prompt
-- system.linux.system.motd.dynamic
-- system.openssh.server.team.all
-
 parameters:
   _param:
     cluster_domain: drivetrain-ha.local
diff --git a/classes/cluster/drivetrain-ha/init.yml b/classes/cluster/drivetrain-ha/init.yml
index 11369f6..aa9cb9b 100644
--- a/classes/cluster/drivetrain-ha/init.yml
+++ b/classes/cluster/drivetrain-ha/init.yml
@@ -4,11 +4,7 @@
   - system.linux.system.haveged
   - system.linux.system.prompt
   - system.linux.system.motd.dynamic
-  - system.openssh.server.team.lab
-  - system.openssh.server.team.tcpcloud
-  - system.openssh.server.team.stacklight
-  - system.openssh.server.team.mcp_qa
-  - system.openssh.server.team.oss_team
+  - system.openssh.server.team.all
   - cluster.drivetrain-ha.infra
   - cluster.drivetrain-ha.cicd.control
   - cluster.overrides