diff --git a/site.conf b/site.conf
index 7a8986d..2d329b4 100644
--- a/site.conf
+++ b/site.conf
@@ -15,21 +15,37 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      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 = 'muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
   },
 
   next_node = {