diff --git a/Makefile b/Makefile
index 69c8bdd..48b681c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,27 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := v2021.1.2
+GLUON_GIT_REF := 204f7e56e31a5e114d594582bbaba5b751770e98
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 
 GLUON_TARGETS ?= \
-        x86-generic \
-	ar71xx-generic \
-	ar71xx-tiny \
-	ar71xx-nand \
 	ath79-generic \
+	ath79-nand \
 	brcm2708-bcm2708 \
 	brcm2708-bcm2709 \
 	ipq806x-generic \
 	lantiq-xrx200 \
 	lantiq-xway \
 	mpc85xx-generic \
+	mpc85xx-p1010 \
 	mpc85xx-p1020 \
 	ramips-mt7620 \
 	ramips-mt7621 \
 	ramips-mt76x8 \
 	ramips-rt305x \
+	rockchip-armv8 \
+	mediatek-mt7622 \
 	ipq40xx-generic \
 	sunxi-cortexa7 \
 	x86-64 \
@@ -29,6 +29,7 @@ GLUON_TARGETS ?= \
 	x86-geode \
 
 
+
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
   GLUON_BRANCH := stable
diff --git a/site.conf b/site.conf
index db5bf92..d3d99f7 100644
--- a/site.conf
+++ b/site.conf
@@ -11,8 +11,6 @@
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = {'ntp.ffrgb.net'},
 
-  mesh_on_wan = false,
-
   regdom = 'DE',
 
   mesh_vpn = {
diff --git a/site.mk b/site.mk
index 47d92c6..df8d334 100644
--- a/site.mk
+++ b/site.mk
@@ -17,7 +17,6 @@ GLUON_FEATURES := \
 GLUON_SITE_PACKAGES := \
 	gluon-segment-mover \
 	iwinfo \
-	iptables \
 	gluon-ssid-changer \
 	respondd-module-airtime \
 	gluon-mesh-vpn-wireguard-vxlan \