diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls
index a239d29..233f434 100644
--- a/salt-pillar/bird/radv.sls
+++ b/salt-pillar/bird/radv.sls
@@ -11,7 +11,7 @@ radv:
         - dnscache.serv
       dnssl:
         - serv.zentralwerk.org
-  clust-gw:
+  cls-gw:
     serv:
       rdnss:
         - dnscache.serv
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 52bf58f..e8f6ee2 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -129,7 +129,7 @@ hosts-inet:
     priv16-gw: 172.20.72.26
     bgp: 172.20.72.27
     mgmt-gw: 172.20.72.28
-    clust-gw: 172.20.72.29
+    cls-gw: 172.20.72.29
     priv17-gw: 172.20.72.30
     priv18-gw: 172.20.72.31
     priv19-gw: 172.20.72.32
@@ -418,7 +418,7 @@ hosts-inet:
 {%- endfor %}
 
   cluster:
-    clust-gw: 172.20.77.1
+    cls-gw: 172.20.77.1
 {%- for i in range(2, 31) %}
     server{{ i }}: 172.20.77.{{ i }}
 {%- endfor %}
@@ -661,7 +661,7 @@ hosts-inet6:
       priv40-gw: fd23:42:c3d2:5e7::1
 
     cluster:
-      clust-gw: fd23:42:c3d2:586::1
+      cls-gw: fd23:42:c3d2:586::1
 {%- for i in range(2, 31) %}
       server{{ i }}: fd23:42:c3d2:586::1{{ i }}
 {%- endfor %}
@@ -684,7 +684,7 @@ hosts-inet6:
       bgp: 2a02:8106:208:5281::c3d2:b
       mgmt-gw: 2a02:8106:208:5281::8:3
       upstream1: 2a02:8106:208:5281::b:0
-      clust-gw: 2a02:8106:208:5281::8:4
+      cls-gw: 2a02:8106:208:5281::8:4
 
       freifunk: 2a02:8106:208:5281:8000::1
       yggdrasil: 2a02:8106:208:5281:9000::1
@@ -699,7 +699,7 @@ hosts-inet6:
       minetest: 2a02:8106:208:5282:c3a:42ff:fe5d:b20c
 
     cluster:
-      clust-gw: 2a02:8106:208:5284::1
+      cls-gw: 2a02:8106:208:5284::1
 {%- for i in range(2, 31) %}
       server{{ i }}: 2a02:8106:208:5284::1{{ i }}
 {%- endfor %}
diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls
index 0c849e5..202cf3b 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -21,7 +21,7 @@ containers:
         type: veth
         hwaddr: 0A:14:48:01:06:00
 
-  clust-gw:
+  cls-gw:
     interfaces:
       core:
         type: veth
diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls
index 0ecb962..c30d963 100644
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@@ -21,9 +21,9 @@ base:
     - bird.ospf
   'pub-gw':
     - collectd.gw
-  'c3d2-gw or c3d2-anon or mgmt-gw or clust-gw':
+  'c3d2-gw or c3d2-anon or mgmt-gw or cls-gw':
     - bird.ospf
-  'c3d2-gw or clust-gw':
+  'c3d2-gw or cls-gw':
     - bird.radv
   'bgp':
     - bird.ospf