diff --git a/.gitmodules b/.gitmodules
index 8cf6535..9254b7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/christf/gluon.git
+	url = https://github.com/FreifunkBremen/gluon.git
diff --git a/gluon b/gluon
index f24a8e8..5b505e4 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit f24a8e854a4f806ede1f3d81b58106ac3ed28931
+Subproject commit 5b505e4fbadd6bafa569c4e9fbd767a6b15327c4
diff --git a/site.conf b/site.conf
index 77c123c..3f1f4be 100644
--- a/site.conf
+++ b/site.conf
@@ -3,12 +3,10 @@
 	site_code = 'ffhb',
 	domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
 
-	prefix4 = '10.196.0.0/17',	-- workaround to get l3roamd running
-	prefix6 = '2a06:8782:ffbb:bab1::/64',	-- (freifunk wide ip)
-	node_prefix6 = '2a06:8782:ffbb:bab0::/64',	-- (freifunk wide inter node ip)
-	node_client_prefix6 = 'fd2f:5119:f2c::/64',	-- infrastructure net (ULA) for node-client-ip addresses (node wide ip)
-	clat_range = 'fd2f:5119:f2c:426::/48',  -- not needed, just for build
-	plat_range = 'fd2f:5119:f2c:624::/48',  -- not needed, just for build
+	prefix6 = '2a06:8782:ffbb:bab0::/64',
+	node_prefix6 = '2a06:8782:ffbb:bab0::/64',
+
+	node_client_prefix6 = '2a06:8782:ffbb:bab1::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {
@@ -17,7 +15,7 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		channel = 6,
+		channel = 5,
 		ap = {
 			ssid = 'ng-bremen.freifunk.net',
 		},
@@ -27,7 +25,7 @@
 		},
 	},
 	wifi5 = {
-		channel = 44,
+		channel = 48,
 		ap = {
 			ssid = 'ng-bremen.freifunk.net',
 		},