diff --git a/db.fff.community b/db.fff.community
index 309b2b4..384a8bc 100644
--- a/db.fff.community
+++ b/db.fff.community
@@ -1,6 +1,6 @@
 $TTL 3600
 
-fff.community.         3600 IN SOA    dnsprim.fff.community. franken.freifunk.net. 2021011502 3600 1800 604800 600
+fff.community.         3600 IN SOA    dnsprim.fff.community. franken.freifunk.net. 2021012301 3600 1800 604800 600
 
 @                           IN NS     icvpn.fff.community.
 @                           IN NS     aquarius.gw.fff.community.
@@ -235,14 +235,21 @@ hh.gw                       IN AAAA   2a0b:f4c0:c8:2c::1
 icvpn.gw                    IN A      10.50.252.0
 luki.gw                     IN A      10.50.80.1
 luki.gw                     IN AAAA   2a0b:f4c0:c8:7a::1
-marterlach.gw               IN A      10.83.252.29
-marterlach.gw               IN AAAA   2a0b:f4c0:c8:6d::1
+
+gw.marterlach               IN A      10.83.252.29
+gw.marterlach               IN AAAA   2a0b:f4c0:c8:6d::1
+marterlach.gw               IN CNAME  gw.marterlach
+
 staufen.gw                  IN A      10.50.80.2
-stmarkus.gw                 IN A      10.83.16.1
-stmarkus.gw                 IN AAAA   2a0b:f4c0:c8:73::1
-hms.gw                      IN A      10.50.56.1
-hms.gw                      IN AAAA   2a0b:f4c0:c8:a1::1
+
+gw.stm                      IN A      10.83.16.1
+gw.stm                      IN AAAA   2a0b:f4c0:c8:73::1
+stmarkus.gw                 IN CNAME  gw.stm
+
+gw.hms                      IN A      10.50.56.1
+gw.hms                      IN AAAA   2a0b:f4c0:c8:a1::1
 ap1.hms                     IN AAAA   2a0b:f4c0:c8:a1:ea94:f6ff:fe06:1fd8
+
 gw.rbs                      IN A      10.83.100.1
 gw.rbs                      IN AAAA   2a0b:f4c0:c8:d3::1
 sw1.rbs                     IN A      10.83.100.5
@@ -254,9 +261,12 @@ ap5.rbs                     IN AAAA   2a0b:f4c0:c8:d3:7626:acff:fe5b:ca00
 ap6.rbs                     IN AAAA   2a0b:f4c0:c8:d3:7626:acff:fe75:3358
 ap7.rbs                     IN AAAA   2a0b:f4c0:c8:d3:02f2:8bff:fe8f:ebf4
 ap8.rbs                     IN AAAA   2a0b:f4c0:c8:d3:86b2:61ff:fe46:0f3c
+
 sw0.fc                      IN AAAA   2a0b:f4c0:c8:73:822a:a8ff:fe9f:4526
-fz.gw                       IN A      10.83.17.1
-fz.gw                       IN AAAA   2a0b:f4c0:c8:74::1
+
+gw.fz                       IN A      10.83.17.1
+gw.fz                       IN AAAA   2a0b:f4c0:c8:74::1
+
 sis-fff-gw1.gw              IN AAAA   2a04:5b81:1fff::c0ff:fe7d:203f
 sis-fff-gw1.gw              IN A      45.87.161.65
 fff-mil01.gw                IN A      10.50.118.1