-@def $master = (82.195.75.110); # master.debian.org
-@def $people = (5.153.231.30); # paradis.debian.org
-@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people);
-
-@def $weasel6 = ();
-@def $weasel6 = ($weasel6 2001:826:408::/48); # unisbg
-@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 $zobel6 = ($zobel6 2a02:158::/32); # DG-i AS
-@def $zobel6 = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
-@def $zobel6 = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
-@def $luca6 = ();
-@def $luca6 = ($luca6 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
-@def $tfheen6 = ();
-@def $tfheen6 = ($tfheen6 2a02:20c8:2640::/64); # vuizook
-@def $tfheen6 = ($tfheen6 2a01:798::/29); # Altibox
-@def $jcristau6 = ();
-@def $jcristau6 = ($jcristau6 2a01:e35:2ff2:f730::/61); # home
-@def $jcristau6 = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
-@def $master6 = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
-
-@def $USER_joerg = ();
-@def $USER_joerg = ($USER_joerg 213.146.108.160/29);
-@def $USER_joerg = ($USER_joerg 46.4.205.32);
-@def $USER_joerg6 = ();
-@def $USER_joerg6 = ($USER_joerg6 2a02:248:1005::/48);
-@def $USER_joerg6 = ($USER_joerg6 2a01:4f8:131:1520::6667);
-
-@def $BUILDD_SSH_ACCESS = ();
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 209.87.16.60); # wuiet
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
+@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 = (5.153.231.30 2001:41c8:1000:21::21:30); # 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);