diff --git a/site_config/beta/site/site.mk b/site_config/beta/site/site.mk
index d93a92f1e39796190a413f847a7528a97949a763..6e0af6a1723434029026d8372ff0fd9a01944929 100644
--- a/site_config/beta/site/site.mk
+++ b/site_config/beta/site/site.mk
@@ -55,7 +55,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2021.1.1.1~beta20220218
+DEFAULT_GLUON_RELEASE := 2021.1.2.1~beta20220507
 
 
 ##	GLUON_RELEASE
diff --git a/site_config/experimental/site/site.mk b/site_config/experimental/site/site.mk
index 7d7276a4df2686ebae39ddc0f2212248c0653f88..8829e0ae247ac50438d61750f35aebdeeff3c964 100644
--- a/site_config/experimental/site/site.mk
+++ b/site_config/experimental/site/site.mk
@@ -55,7 +55,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2021.1.1.1~exp20220216
+DEFAULT_GLUON_RELEASE := 2021.1.2.1~exp20220505
 
 
 ##	GLUON_RELEASE
diff --git a/site_config/stable/site/site.conf b/site_config/stable/site/site.conf
index e8f889ae10754940cb4a28b22629414853537d02..7d4c36b72ae8781d81c8e9d10efcf744b3362f72 100644
--- a/site_config/stable/site/site.conf
+++ b/site_config/stable/site/site.conf
@@ -31,7 +31,7 @@
 
   -- List of NTP servers in your community.
   -- Must be reachable using IPv6!
-  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'},
+  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12','fd4e:f2d7:88d2:fffe::19'},
 
   -- Wireless regulatory domain of your community.
   regdom = 'LU',
@@ -99,14 +99,18 @@
 
         -- List of peers.
         peers = {
-      gw1= {
-	    key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
-	    remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
-      },
-	  gw2= {
-	    key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b',
-	    remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'},
-	  }
+          gw1 = {
+            key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
+            remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
+          },
+          gw2 = {
+            key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b',
+            remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'},
+          },
+          test = {
+            key = '95b22943135927cc1da6800ba152819ae5ee26cbb83d6354bc81a5ce632fcb5a',
+            remotes = {'ipv4 "fflux-test.freifunk.lu" port 10000'},
+          },
         },
       },
     },
@@ -127,6 +131,7 @@
         mirrors = {
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
                 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::19]/stable/sysupgrade',
 	        'http://firmware.freifunk.lu/stable/sysupgrade',
         },
 
@@ -150,9 +155,10 @@
 
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
-            'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
-            'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
-            'http://firmware.freifunk.lu/beta/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::19]/beta/sysupgrade',
+		'http://firmware.freifunk.lu/beta/sysupgrade',
         },
 
         -- Number of good signatures required.
@@ -175,9 +181,10 @@
 
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
-            'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
-            'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
-            'http://firmware.freifunk.lu/experimental/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
+		'http://[fd4e:f2d7:88d2:fffe::19]/experimental/sysupgrade',
+		'http://firmware.freifunk.lu/experimental/sysupgrade',
         },
 
         -- Number of good signatures required.
diff --git a/site_config/stable/site/site.mk b/site_config/stable/site/site.mk
index f950a4536d0f39e57cbc98e30c736832e894467c..9537eaba492972be3f84820d42d990629d9a9419 100644
--- a/site_config/stable/site/site.mk
+++ b/site_config/stable/site/site.mk
@@ -55,7 +55,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2020.2.3~stable202108
+DEFAULT_GLUON_RELEASE := 2021.1.2~stable202205
 
 
 ##	GLUON_RELEASE
@@ -70,14 +70,19 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
-GLUON_BRANCH ?= stable
+
+# Firmware branch and autoupdater config
+GLUON_AUTOUPDATER_BRANCH ?= stable
+
+GLUON_AUTOUPDATER_ENABLED ?= 1
 
 # set mesh mode for ath10k to 802.11s
 GLUON_ATH10K_MESH ?= 11s
 
 # Languages to include
-GLUON_LANGS ?= en
+GLUON_LANGS ?= de en
 
+# define a region for specific devices like TP-Link Archer C7
 GLUON_REGION := eu
 
 USB_X86_GENERIC_NETWORK_MODULES := \