-@def $luca = (64.71.152.109);
-@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
-@def $tfheen = (87.238.43.224/27);
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
-
-@def $sgran6 = (2001:4b10:100b::/48);
-@def $sgran6 = ($sgran6 2001:4b10:0000:810b::/64);
-@def $weasel6 = ();
-@def $weasel6 = ($weasel6 2001:826:408:200::/56); # came
-@def $weasel6 = ($weasel6 2001:858:10f::/48); # anguilla
-@def $zobel6 = ();
-@def $zobel6 = ($zobel6 2001:6f8:1215::/48); # baldur
-@def $zobel6 = ($zobel6 2001:6f8:928::/48); # WS2
-@def $zobel6 = ($zobel6 2a01:198:549::/48); # WGS20
-@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
-@def $luca6 = ();
-@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
-@def $tfheen6 = (2a02:c0:1013:1::/64);
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
-
-@def $USER_christoph = ();
-@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
-@def $USER_aurel32 = ();
-@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
-@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
-
-@def $BUILDD_SSH_ACCESS = ();
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 70.103.162.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
-@def $FREEBSD_SSH_ACCESS = ();
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph $USER_aurel32); # buildd admins
+@def $zobel = ($zobel 217.6.179.48/29); # credativ DTAG
+@def $zobel = ($zobel 62.154.226.64/27); # credativ DTAG 2
+@def $zobel = ($zobel 92.198.42.24/29); # DG-i Office
+@def $zobel = ($zobel 93.94.128.0/21); # DG-i AS
+@def $zobel = ($zobel 195.49.152.0/22); # DG-i AS
+@def $zobel = ($zobel 194.187.64.0/22); # DG-i AS
+@def $zobel = ($zobel 88.99.108.200/29); # buri, dag, ...
+@def $zobel = ($zobel 2001:6f8:1215::/48); # baldur
+@def $zobel = ($zobel 2001:6f8:928::/48); # WS2
+@def $zobel = ($zobel 2a01:198:549::/48); # WGS20
+@def $zobel = ($zobel 2a01:198:6b2::/48); # AdS20
+@def $zobel = ($zobel 2a02:158::/32); # DG-i AS
+@def $zobel = ($zobel 2003:5b:203b::/48); # credativ DTAG v6
+@def $zobel = ($zobel 2a01:4f8:10a:1504::/64); # buri, dag, ....
+
+@def $luca = ();
+@def $luca = ($luca 162.210.192.22); # jump snafu.emyr.net
+@def $luca = ($luca 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
+
+@def $tfheen = ();
+@def $tfheen = ($tfheen 178.255.151.162); # vuizook
+@def $tfheen = ($tfheen 51.174.0.0/15); # Altibox
+@def $tfheen = ($tfheen 2a02:20c8:2640::/64); # vuizook
+@def $tfheen = ($tfheen 2a01:798::/29); # Altibox
+
+@def $jcristau = ();
+@def $jcristau = ($jcristau 82.255.47.115/32); # home
+@def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
+@def $jcristau = ($jcristau 2a01:e35:2ff2:f730::/61); # home
+@def $jcristau = ($jcristau 2001:bc8:3f1d::/48); # topinambour
+
+@def $master = (82.195.75.110 2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $people = (209.87.16.67 2607:f8f0:614:1::1274:67); # paradis.debian.org
+@def $draghi = (82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a); # draghi.debian.org
+
+@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people $draghi);