diff --git a/site.conf b/site.conf
index 7a8986d..1976a5a 100644
--- a/site.conf
+++ b/site.conf
@@ -15,21 +15,37 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
-    channel = 6,
+    channel = 11,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'test.muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'test.mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'test.muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'test.mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
   },
 
   next_node = {
@@ -45,60 +61,10 @@
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {   --[[ fpletz ]]
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+          gw_test = {   --[[ fpletz ]]
+            key = '23280df37b96cb587a3eeeb51c806bceeb627b8d063bb7dcc5492f4c9e3af356',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10001',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw04 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-            remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10001',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-            remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10001',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10001',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10001',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10001',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10001',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10001',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10001',
+              'ipv4 "hermes.fnordicwalking.de" port 16000',
             },
           },
         },