diff --git a/build.sh b/build.sh
index bb9d8e7..bd9b394 100755
--- a/build.sh
+++ b/build.sh
@@ -33,8 +33,8 @@ done
 # generate manifests
 make manifest
 
-if [ -z "${GLUON_BRANCH:-}" ]; then
-    make manifest GLUON_BRANCH=testing GLUON_PRIORITY=0
+if [ -z "${GLUON_AUTOUPDATER_BRANCH:-}" ]; then
+    make manifest GLUON_AUTOUPDATER_BRANCH=testing GLUON_PRIORITY=0
     # add BRANCH=nightly line below BRANCH=testing line
     sed -i -e "/^BRANCH=testing/ a BRANCH=nightly" \
         "${GLUON_DIR}/output/images/sysupgrade/testing.manifest"
diff --git a/domains/ffhb_11s.conf b/domains/ffhb_11s.conf
deleted file mode 100644
index 66e1736..0000000
--- a/domains/ffhb_11s.conf
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-	domain_names = {
-		ffhb_11s = 'Freifunk Bremen - altes Netz (bis Juni 2022; mit Batman 2013)',
-	},
-	domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016',
-
-	ntp_servers = {
-		'1.ntp.bremen.freifunk.net',
-		'2.ntp.bremen.freifunk.net',
-		'3.ntp.bremen.freifunk.net',
-		'5.ntp.bremen.freifunk.net',
-		'6.ntp.bremen.freifunk.net',
-	},
-	dns = {
-		servers = {
-			'fd2f:5119:0f2c::1',
-			'fd2f:5119:0f2c::2',
-			'fd2f:5119:0f2c::3',
-			'fd2f:5119:0f2c::5',
-			'fd2f:5119:0f2c::6',
-		},
-	},
-
-	prefix4 = '10.196.0.0/17',
-	prefix6 = 'fd2f:5119:0f2c::/64',
-
-	wifi24 = {
-		channel = 6,
-		ap = {
-			ssid = 'bremen.freifunk.net',
-		},
-		mesh = {
-			id = 'mesh.ffhb.de',
-			mcast_rate = 6000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'bremen.freifunk.net',
-		},
-		mesh = {
-			id = 'mesh.ffhb.de',
-			mcast_rate = 6000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-		batman_adv = {
-			routing_algo = 'BATMAN_IV_LEGACY',
-		},
-	},
-
-	next_node = {
-		name = {
-			'node.ffhb.de',
-			'node.bremen.freifunk.net',
-		},
-		ip4 = '10.196.0.127',
-		ip6 = 'fd2f:5119:0f2c::127',
-		mac = '16:41:95:40:f7:dc',
-	},
-	mesh_vpn = {
-		fastd = {
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn01 = {
-							key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
-							remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
-						},
-						vpn02 = {
-							key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
-							remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
-						},
-						vpn03 = {
-							key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
-							remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
-						},
-						vpn05 = {
-							key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
-							remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
-						},
-						vpn06 = {
-							key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
-							remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
-						},
-					},
-				},
-			},
-		},
-	},
-	domain_switch = {
-		target_domain = 'ffhb_batv15',
-		switch_after_offline_mins = 1440, -- 1 day
-		switch_time = 1656633600, -- Fr 1. Jul 02:00:00 CEST 2022
-		connection_check_targets = {
-			'2001:4860:4860::8888', -- Google DNS
-			'2a06:8782:ff00::f7', -- vpn01
-			'2a06:8782:ff02::e4', -- vpn02
-			'2a06:8782:ff02::e8', -- vpn07
-		},
-	},
-}
-
--- vim: noet ts=4
diff --git a/domains/ffhb_legacy.conf b/domains/ffhb_legacy.conf
deleted file mode 100644
index 3df1d9a..0000000
--- a/domains/ffhb_legacy.conf
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-	domain_names = {
-		ffhb_legacy = 'Freifunk Bremen - ganz altes Netz (bis März 2020; mit IBSS Mesh-Unterstützung)',
-	},
-	hide_domain = true,
-	domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016',
-
-	ntp_servers = {
-		'1.ntp.bremen.freifunk.net',
-		'2.ntp.bremen.freifunk.net',
-		'3.ntp.bremen.freifunk.net',
-		'5.ntp.bremen.freifunk.net',
-		'6.ntp.bremen.freifunk.net',
-	},
-	dns = {
-		servers = {
-			'fd2f:5119:0f2c::1',
-			'fd2f:5119:0f2c::2',
-			'fd2f:5119:0f2c::3',
-			'fd2f:5119:0f2c::5',
-			'fd2f:5119:0f2c::6',
-		},
-	},
-
-	prefix4 = '10.196.0.0/17',
-	prefix6 = 'fd2f:5119:0f2c::/64',
-
-	wifi24 = {
-		channel = 6,
-		ap = {
-			ssid = 'bremen.freifunk.net',
-		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
-		},
-	},
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'bremen.freifunk.net',
-		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-		batman_adv = {
-			routing_algo = 'BATMAN_IV_LEGACY',
-		},
-	},
-
-	next_node = {
-		name = {
-			'node.ffhb.de',
-			'node.bremen.freifunk.net',
-		},
-		ip4 = '10.196.0.127',
-		ip6 = 'fd2f:5119:0f2c::127',
-		mac = '16:41:95:40:f7:dc',
-	},
-	mesh_vpn = {
-		fastd = {
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn01 = {
-							key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
-							remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
-						},
-						vpn02 = {
-							key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
-							remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
-						},
-						vpn03 = {
-							key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
-							remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
-						},
-						vpn05 = {
-							key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
-							remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
-						},
-						vpn06 = {
-							key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
-							remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
-						},
-					},
-				},
-			},
-		},
-	},
-	domain_switch = {
-		target_domain = 'ffhb_11s',
-		switch_after_offline_mins = 120,
-		switch_time = 1583366400, -- Thu Mar 5 00:00:00 2020 UTC
-		connection_check_targets = {
-			'2001:4860:4860::8888',
-			'2001:4860:4860::8844',
-		},
-	},
-}
-
--- vim: noet ts=4
diff --git a/gluon b/gluon
index 250b623..d0f43ae 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 250b623fb4a1bc2d6e0b91809385b8aaa1a4b5d5
+Subproject commit d0f43aeb0810bd0841c90dc1bc0c18d7aa591fa7
diff --git a/site.mk b/site.mk
index c6f456b..4db5b4f 100755
--- a/site.mk
+++ b/site.mk
@@ -8,8 +8,7 @@ GLUON_FEATURES := \
 	respondd \
 	status-page \
 	web-advanced \
-	web-wizard \
-	mesh-batman-adv-14
+	web-wizard
 
 GLUON_SITE_PACKAGES := \
 	gluon-ssid-changer \
@@ -23,21 +22,19 @@ GLUON_SITE_PACKAGES := \
 	gluon-radv-filterd \
 	gluon-setup-mode \
 	gluon-speedtest \
-	iputils-ping6 \
 	iwinfo \
-	iptables \
 	firewall \
-	haveged \
+	urngd \
 	gluon-scheduled-domain-switch
 
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
-GLUON_BRANCH ?= stable
+GLUON_AUTOUPDATER_BRANCH ?= stable
+GLUON_AUTOUPDATER_ENABLED ?= 1
 GLUON_PRIORITY ?= 0
 GLUON_DEPRECATED ?= upgrade
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
-GLUON_WLAN_MESH ?= 11s
 GLUON_MULTIDOMAIN=1