diff --git a/salt/top.sls b/salt/top.sls
index fa4fe89..b747fdc 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -16,14 +16,10 @@ base:
     - collectd
   'priv13-gw':
     - firewall.priv-stateful
-  'pub-gw or serv-gw':
-    - no-ssh
-    - forwarding
-    - bird
   'pub-gw':
     - dhcp
     - collectd
-  'c3d2-gw or c3d2-anon or mgmt-gw':
+  'pub-gw or serv-gw or cls-gw or c3d2-gw or c3d2-anon or mgmt-gw':
     - no-ssh
     - forwarding
     - bird