diff --git a/build.sh b/build.sh
index f4f3cad..8934305 100755
--- a/build.sh
+++ b/build.sh
@@ -33,9 +33,13 @@ done
 # generate manifests
 make manifest
 
-if [ -z "${GLUON_BRANCH:-}" ]; then
-    make manifest GLUON_BRANCH=babel GLUON_PRIORITY=0
-    ln -sf babel.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest"
+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"
+    ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/nightly.manifest"
+    ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest"
 fi
 
 # sign testing/nightly manifest if key is present
diff --git a/gluon b/gluon
index 0394047..d0f43ae 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 0394047a70cae09deef69e4a10b7b559e96ceeef
+Subproject commit d0f43aeb0810bd0841c90dc1bc0c18d7aa591fa7
diff --git a/site.mk b/site.mk
index 941df95..4f3dee7 100755
--- a/site.mk
+++ b/site.mk
@@ -13,7 +13,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-speedtest \
 	iwinfo \
 	firewall \
-	haveged \
+	urngd \
 	gluon-authorized-keys
 #TODO iptables ?
 #TODO iputils-ping6 ?
@@ -32,13 +32,12 @@ GLUON_SITE_PACKAGES += \
 
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
-GLUON_AUTOUPDATE_BRANCH ?= stable
+GLUON_AUTOUPDATER_BRANCH ?= stable
 GLUON_AUTOUPDATER_ENABLED ?= 1
 GLUON_PRIORITY ?= 0
 GLUON_DEPRECATED ?= 0
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
-GLUON_WLAN_MESH ?= 11s
 
 
 # Debug packages