diff --git a/roles/ff_monitor/templates/config.local.php.j2 b/roles/ff_monitor/templates/config.local.php.j2
index ddbf1d0..c551ab4 100644
--- a/roles/ff_monitor/templates/config.local.php.j2
+++ b/roles/ff_monitor/templates/config.local.php.j2
@@ -23,65 +23,77 @@
     'vmhost03.berlin.freifunk.net',
     'a36s-hyp01.berlin.freifunk.net',
   );
-  $CONFIG['cat']['Tunnel Gateways'] = '/^vpn0|^freifunk-gw01/i';
   $CONFIG['cat']['Backbone Gateway Nodes'] = '/-gw$/i';
   $CONFIG['cat']['BBB-VPN'] = '/bbb-vpn/';
 
   # Locations in alphabetical order
+
   $CONFIG['cat']['AK36'] = '/^ak36-/';
   $CONFIG['cat']['Andreas-Gymnasium'] = '/^agym-/i';
   $CONFIG['cat']['Berliner Hochschule für Technik (BHT)'] = '/^bht/i';
   $CONFIG['cat']['Cafe Wostok'] = '/^cafe-wostok-/i';
+  $CONFIG['cat']['c-base'] = '/^c-base-/i';
   $CONFIG['cat']['Christoperous Kirche'] = '/^chris-/i';
   $CONFIG['cat']['Colbe15'] = '/^colbe15-/i';
   $CONFIG['cat']['Cottbuss'] = '/^cottbus/i';
+  $CONFIG['cat']['Cralle'] = '/^cralle-/';
   $CONFIG['cat']['Dorfplatz'] = '/^dorfplatz-/i';
   $CONFIG['cat']['Dragonkiez'] = '/^dragonkiez/i';
   $CONFIG['cat']['E16'] = '/^e16-|e16outdoor-/i';
   $CONFIG['cat']['Eberswalder7'] = '/^eberswalder7-/i';
+  $CONFIG['cat']['Ekke'] = '/^ekke-/';
   $CONFIG['cat']['Emmaus Kirche'] = '/^emma-/i';
-  $CONFIG['cat']['Fürstenwalde'] = '/^fffw/i';
-  $CONFIG['cat']['F17'] = '/^f17-/i';
   $CONFIG['cat']['Fanninger47'] = '/^fanninger47-/i';
   $CONFIG['cat']['Fesev'] = '/^fesev-/i';
   $CONFIG['cat']['Finanamt Reinickendorf'] = '/^fardf/i';
   $CONFIG['cat']['Flughafen Tempelhof'] = '/^flughafen/i';
   $CONFIG['cat']['FrischAuf'] = '/^FrischAuf-/i';
+  $CONFIG['cat']['Fürstenwalde'] = '/^fffw/i';
   $CONFIG['cat']['Glanz15'] = '/^glanz15-/i';
   $CONFIG['cat']['Glienicke'] = '/^glienicke/i';
   $CONFIG['cat']['Gruni73'] = '/^gruni73/i';
   $CONFIG['cat']['Gub37'] = '/^gub37-/i';
-  $CONFIG['cat']['HDK'] = '/^hdk|parzelle17-/i';
   $CONFIG['cat']['Habersaath'] = '/^habersaath/i';
   $CONFIG['cat']['Halle'] = '/^halle-/i';
   $CONFIG['cat']['Haus Der Statistik'] = '/^hds|^hdm/i';
+  $CONFIG['cat']['HDK'] = '/^hdk|parzelle17-/i';
   $CONFIG['cat']['Hirschhof'] = '/^hirschhof-/i';
+  $CONFIG['cat']['Hway'] = '/^hway-/';
+  $CONFIG['cat']['ILR'] = '/^ilr-/';
   $CONFIG['cat']['J41'] = '/^j41-/';
   $CONFIG['cat']['JUP'] = '/^jup-/i';
   $CONFIG['cat']['Kastanienallee'] = '/^k12|^k11/i';
   $CONFIG['cat']['Kiehlufer'] = '/^kiehlufer/i';
+  $CONFIG['cat']['Kiezladen154'] = '/^kiezladen154-/';
   $CONFIG['cat']['Kirchhof'] = '/^kirchhof-/i';
   $CONFIG['cat']['Klunkerkranich'] = '/^klunker-/i';
+  $CONFIG['cat']['Knallt-M42'] = '/^knallt-m42-/';
   $CONFIG['cat']['Kosmos'] = '/^kosmos-/i';
+  $CONFIG['cat']['Kotti'] = '/^kotti-/';
   $CONFIG['cat']['Kts13'] = '/^kts13-/';
   $CONFIG['cat']['Kub'] = '/^kub-/';
   $CONFIG['cat']['L105'] = '/^l105-/';
   $CONFIG['cat']['L5'] = '/^l5-/i';
   $CONFIG['cat']['Liese21'] = '/^liese-21-/i';
   $CONFIG['cat']['Linie206'] = '/^linie206/i';
-  $CONFIG['cat']['MGH'] = '/^mgh-/';
   $CONFIG['cat']['Ma78'] = '/^ma78-/';
   $CONFIG['cat']['Magda'] = '/^magda/i';
   $CONFIG['cat']['Mahalle'] = '/^mahalle-/i';
   $CONFIG['cat']['Manstein10'] = '/^manstein10-/i';
   $CONFIG['cat']['Martin Luther Kirche'] = '/^mlk-nk-/';
+  $CONFIG['cat']['Melanchthonkirche'] = '/^mela-/i';
+  $CONFIG['cat']['MGH'] = '/^mgh-/';
+  $CONFIG['cat']['Newyorck'] = '/^newyorck-/i';
   $CONFIG['cat']['Ohlauer'] = '/^ohlauer-/';
+  $CONFIG['cat']['Perle'] = '/^perle-/';
+  $CONFIG['cat']['Perleberger36'] = '/^perleberger36-/';
   $CONFIG['cat']['Philmel'] = '/^philmel/i';
   $CONFIG['cat']['Potse'] = '/^potse-/';
   $CONFIG['cat']['Q216'] = '/^q216-/';
   $CONFIG['cat']['Rathaus Kreuzberg'] = '/^rhxb-/';
   $CONFIG['cat']['Rathaus Neukoelln'] = '/^rhnk-/';
   $CONFIG['cat']['Rauchhaus'] = '/^rauchhaus/i';
+  $CONFIG['cat']['Rev99'] = '/^rev99-/';
   $CONFIG['cat']['Rigaer78'] = '/^rigaer78/i';
   $CONFIG['cat']['Rigaer83'] = '/^rigaer83/i';
   $CONFIG['cat']['Rio'] = '/^rio-/';
@@ -89,6 +101,7 @@
   $CONFIG['cat']['Saarbruecker'] = '/^saarbruecker-/';
   $CONFIG['cat']['Sama27'] = '/^sama27-/';
   $CONFIG['cat']['Samariterkirche'] = '/^sama-/';
+  $CONFIG['cat']['Sav'] = '/^sav-/';
   $CONFIG['cat']['Scharni'] = '/^scharni/';
   $CONFIG['cat']['Scherer8'] = '/^scherer|basta/i';
   $CONFIG['cat']['Schreiner'] = '/^schreiner-/i';
@@ -99,8 +112,10 @@
   $CONFIG['cat']['Spitta13'] = '/^spitta13-/';
   $CONFIG['cat']['St.-Adalbert Kirche'] = '/^stadalbert-/i';
   $CONFIG['cat']['Strom'] = '/^strom-/';
+  $CONFIG['cat']['T1'] = '/^t1-/';
   $CONFIG['cat']['Technik Museum'] = '/^dtmb-/i';
-  $CONFIG['cat']['Teufelsberg'] = '/^teufelsberg-/i';
+  $CONFIG['cat']['Tempelwg'] = '/^tempelwg-/';
+  $CONFIG['cat']['Teufelsberg'] = '/^teufelsberg-|teufelssecurity-/i';
   $CONFIG['cat']['Torte'] = '/^torte-/';
   $CONFIG['cat']['Vaterhaus'] = '/^vaterhaus/i';
   $CONFIG['cat']['W38B'] = '/^w38b-/i';