diff --git a/image-customization.lua b/image-customization.lua
index 37912f7..874430f 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -50,7 +50,7 @@ if device({
         'web-cellular',
     }
     packages {
-        'ffac-private-wan-dhcp',
+        'ffac-web-private-wan-dhcp',
     }
 end
 
@@ -179,6 +179,7 @@ if include_usb then
     packages(pkgs_usb_net)
     packages(pkgs_usb_serial)
     packages(pkgs_usb_storage)
+    packages {'ffka-gluon-web-usb-wan-hotplug', 'ffac-update-location-gps'}
 end
 
 -- device has no reset button and requires a special package to go into setup mode
@@ -207,8 +208,8 @@ if target('bcm27xx') then
     packages(pkgs_hid)
 end
 
-if target('ramips', 'mt7621') or target('mediatek', 'filogic') then
-	-- reload wifi firmware twice a day
+if target('ramips', 'mt7621') or target('ramips', 'mt7622') or target('mediatek', 'filogic') then
+	-- restart device if mt7915e driver shows known failure symptom
 	packages {
 		'ffac-mt7915-hotfix',
 	}
diff --git a/modules b/modules
index 72b6542..1f6a523 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,9 @@
-GLUON_SITE_FEEDS="ffac community"
-
-PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
-PACKAGES_FFAC_COMMIT=e3e0b5aac4ed0d610eb06161061b907b5bb2117d
-PACKAGES_FFAC_BRANCH=main
+GLUON_SITE_FEEDS="community ffac"
 
 PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=ed68c7060e6122537038ece7de920d199aeed9b0
-PACKAGES_COMMUNITY_BRANCH=master
+PACKAGES_COMMUNITY_COMMIT=106ff0544832fcc5573a1bea504c0b0a536cb1cd
+PACKAGES_COMMUNITY_BRANCH=update-location-gps
+
+PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
+PACKAGES_FFAC_COMMIT=b7ccdae873eebaa01aa555ec2a356d370e8d3908
+PACKAGES_FFAC_BRANCH=private-wan-dhcp-web
diff --git a/release.mk b/release.mk
index 31c88c6..829b060 100644
--- a/release.mk
+++ b/release.mk
@@ -1,2 +1,2 @@
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2023.2.3 # v2023.2.x
+GLUON_GIT_REF := 05b36ba7608f7ac83373cd4bdfc34ef142e05c76 # v2023.2.x