diff --git a/site.conf b/site.conf
index 52ab834..9d65a73 100644
--- a/site.conf
+++ b/site.conf
@@ -14,20 +14,36 @@
     },
     regdom = 'DE',
     wifi24 = {
-        ssid = 'Freifunk',
         channel = 5,
         htmode = 'HT20',
-        mesh_ssid = 'troisdorf-ff-mesh',
-        mesh_bssid = '02:74:05:d0:4f:00',
-        mesh_mcast_rate = 12000,
+        ap = {
+            ssid = 'Freifunk',
+        },
+        mesh = {
+            ip = 'troisdorf-ff-mesh',
+            mcast_rate = 12000,
+        },
+        ibss ={
+            ssid = '02:74:05:d0:4f:00',
+            bssid = '02:74:05:d0:4f:00',
+            mcast_rate = 12000,
+        },
     },
     wifi5 = {
-        ssid = 'Freifunk',
         channel = 44,
         htmode = 'HT40+',
-        mesh_ssid = 'troisdorf-ff-mesh',
-        mesh_bssid = '02:74:05:d0:4f:00',
-        mesh_mcast_rate = 12000,
+        ap = {
+            ssid = 'Freifunk',
+        },
+        mesh = {
+            ip = 'troisdorf-ff-mesh',
+            mcast_rate = 12000,
+        },
+        ibss ={
+            ssid = '02:74:05:d0:4f:00',
+            bssid = '02:74:05:d0:4f:00',
+            mcast_rate = 12000,
+        },
     },
     next_node = {
         ip4 = '10.188.0.1',