diff --git a/site.conf b/site.conf
index 698dbe9..753b885 100644
--- a/site.conf
+++ b/site.conf
@@ -12,20 +12,36 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		ssid = 'luebeck.freifunk.net',
 		channel = 1,
 		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:37:fc:38',
-		mesh_bssid = '02:d1:11:37:fc:38',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'luebeck.freifunk.net',
+		},
+		ibss = {
+			ssid = '02:d1:11:37:fc:38',
+			bssid = '02:d1:11:37:fc:38',
+			mcast_rate = 12000,
+		},
+		mesh = {
+			id = 'eseB6Qlu',
+			mcast_rate = 12000,
+		},
 	},
 	wifi5 = {
-		ssid = 'luebeck.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:37:fc:38',
-		mesh_bssid = '02:d1:11:37:fc:38',
-		mesh_mcast_rate = 12000,
+		master = {
+			ssid = 'luebeck.freifunk.net',
+		},
+		ibss = {
+			ssid = '02:d1:11:37:fc:38',
+			bssid = '02:d1:11:37:fc:38',
+			mcast_rate = 12000,
+		},
+		mesh = {
+			id = 'eseB6Qlu',
+			mcast_rate = 12000,
+		},
 	},
 
 	next_node = {