diff --git a/site.conf b/site.conf
index cbed0ba..26c2e35 100644
--- a/site.conf
+++ b/site.conf
@@ -12,20 +12,36 @@
     },
     regdom = 'DE',
     wifi24 = {
-        ssid = 'Freifunk',
-        channel = 5,
-        htmode = 'HT40-',
-        mesh_ssid = 'troisdorf-ff-mesh',
-        mesh_bssid = '02:74:05:d0:4f:00',
-        mesh_mcast_rate = 12000,
+    	channel = 5,
+    	htmode = 'HT40-',
+    	ap = {
+    		ssid = 'Freifunk',
+    	},
+    	mesh = {
+    		id = 'troisdorf-ff-mesh',
+    		mcast_rate = 12000,
+    	},
+    	ibbs = {
+    		ssid = 'troisdorf-ff-mesh',
+    		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,
+    	channel = 44,
+    	htmode = 'HT40+',
+    	ap = {
+    		ssid = 'Freifunk',
+    	},
+    	mesh = {
+    		id = 'troisdorf-ff-mesh',
+    		mcast_rate = 12000,
+    	},
+    	ibbs = {
+    		ssid = 'troisdorf-ff-mesh',
+    		bssid = '02:74:05:d0:4f:00',
+    		mcast_rate = 12000,
+    	},
     },
     next_node = {
         ip4 = '10.188.0.1',