diff --git a/image-customization.lua b/image-customization.lua
index 55bf4ac..acf0d4b 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -214,7 +214,7 @@ if target('bcm27xx') then
     packages(pkgs_hid)
 end
 
-if target('ramips', 'mt7621') or target('mediatek', 'filogic') then
+if target('ramips', 'mt7621') or target('ramips', 'mt7622') or target('mediatek', 'filogic') then
 	-- reload wifi firmware twice a day
 	packages {
 		'ffac-mt7915-hotfix',
diff --git a/modules b/modules
index 3e1f244..3550e85 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,9 @@
-GLUON_SITE_FEEDS="ffac community"
+GLUON_SITE_FEEDS="community ffac"
+
+PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=106ff0544832fcc5573a1bea504c0b0a536cb1cd
+PACKAGES_COMMUNITY_BRANCH=update-location-gps
 
 PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
-PACKAGES_FFAC_COMMIT=941329efa34d46de1ec34d77242d5b86d664b6de
+PACKAGES_FFAC_COMMIT=0acd51449c3173e218cdecda60c38865596662a5
 PACKAGES_FFAC_BRANCH=private-wan-dhcp-web
-
-PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=ed68c7060e6122537038ece7de920d199aeed9b0
-PACKAGES_COMMUNITY_BRANCH=master