diff --git a/modules b/modules
index 368537c99a110fe26d50e96364e5415a2ef52aca..0e08ae755648df243ae49d8b0d633e815a2d9a55 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffnw'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
-PACKAGES_FFNW_BRANCH=v2017.1.x
-PACKAGES_FFNW_COMMIT=61a14c9a68c0a59e02cc71e5197e1683bec0d60d
+PACKAGES_FFNW_BRANCH=master
+PACKAGES_FFNW_COMMIT=fe86df0c94525f6b6325f583cdd4cff73ffa44d6
diff --git a/site.conf b/site.conf
index 180ab8c08ac2cf44c17d9ed7e5bfd8225185ac3d..40cdbf419b7afd4c5442577a4a95a77a2ffefd05 100644
--- a/site.conf
+++ b/site.conf
@@ -107,7 +107,7 @@
 				mirrors = {
 					'http://autoupdate-lede.ffnw/stable',
 				},
-				good_signatures = 5,
+				good_signatures = 4,
 				pubkeys = {
 					'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
 					'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
diff --git a/site.mk b/site.mk
index ef9e13e5dff0768372dcef5d1b319a0e91643e32..a05240561621023a59b46b5c6e9f88e708e9d327 100644
--- a/site.mk
+++ b/site.mk
@@ -52,11 +52,10 @@ ifeq ($(GLUON_TARGET),x86-64)
 		kmod-igb
 endif
 
-
 GLUON_ATH10K_MESH := ibss
 
 # Allow overriding from the command line
 GLUON_RELEASE ?= $(shell date '+%Y%m%d')-$(shell git log -1 --pretty=format:%h)
-GLUON_PRIORITY ?= 2
+GLUON_PRIORITY ?= 0
 GLUON_REGION ?= eu
 GLUON_LANGS ?= de en