diff --git a/site.conf b/site.conf
index 3fe07a8..dcc9b96 100644
--- a/site.conf
+++ b/site.conf
@@ -12,21 +12,37 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		ssid = 'hamburg.freifunk.net',
 		channel = 1,
 		htmode = 'HT20',
-		mesh_ssid = 'f8:d1:11:87:52:2e',
-		mesh_bssid = 'f8:d1:11:87:52:2e',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+		ibss = {
+			ssid = 'f8:d1:11:87:52:2e',
+			bssid = 'f8:d1:11:87:52:2e',
+			mcast_rate = 12000,
+		},
+		mesh = {
+			id = 'ffhh-mesh',
+			mcast_rate = 12000,
+		},
 	},
 
 	wifi5 = {
-		ssid = 'hamburg.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
-		mesh_ssid = 'f8:d1:11:87:52:2e',
-		mesh_bssid = 'f8:d1:11:87:52:2e',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+		ibss = {
+			ssid = 'f8:d1:11:87:52:2e',
+			bssid = 'f8:d1:11:87:52:2e',
+			mcast_rate = 12000,
+		},
+		mesh = {
+			id = 'ffhh-mesh',
+			mcast_rate = 12000,
+		},
 	},
 
 	next_node = {
@@ -100,7 +116,7 @@
 				},
 			},
 			beta = {
-				name = 'beta',	
+				name = 'beta',
 				mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {