diff --git a/image-customization.lua b/image-customization.lua
index 37912f7..6d47d5d 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -17,15 +17,22 @@ features {
 
 packages {
     'iwinfo',
-    'ffac-ssid-changer',
     'ffac-wg-registration',
-    'ff-web-ap-timer',
     'respondd-module-airtime',
     'tecff-general-workaround',
     'tecff-broken-wlan-workaround',
 }
 
-if not device_class('tiny') then
+include_usb = false
+
+tiny_like = device({
+    'tp-link-archer-c6-v2-eu-ru-jp',
+    'tp-link-archer-c60-v1',
+    'tp-link-td-w8970',
+    'tp-link-td-w8980',
+})
+
+if not device_class('tiny') and not tiny_like then
     features {
         'tls',
         'wireless-encryption-wpa3',
@@ -34,7 +41,11 @@ if not device_class('tiny') then
         'openssh-sftp-server',
         'ffac-autoupdater-wifi-fallback',
         'ffmuc-custom-banner',
+        'ffac-ssid-changer',
+        'ff-web-ap-timer',
     }
+    -- usb is only default available for non-tiny devices
+    include_usb = true
 end
 
 if device({
@@ -50,7 +61,7 @@ if device({
         'web-cellular',
     }
     packages {
-        'ffac-private-wan-dhcp',
+        'ffac-web-private-wan-dhcp',
     }
 end
 
@@ -113,8 +124,6 @@ pkgs_pci = {
     'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
 }
 
-include_usb = true
-
 -- rtl838x has no USB support as of Gluon v2023.2
 if target('realtek', 'rtl838x') or target('ramips', 'mt7620') then
     include_usb = false
@@ -179,6 +188,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,7 +217,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 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/patches/020-interfaces.patch b/patches/020-interfaces.patch
index 2a2ad3c..bf13137 100644
--- a/patches/020-interfaces.patch
+++ b/patches/020-interfaces.patch
@@ -1,16 +1,8 @@
 diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
-index 22bf7bb8..0cddbaea 100755
+index 5e5243a0..81ff6513 100755
 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
 +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
-@@ -70,10 +70,29 @@ elseif platform.match('ramips', 'mt7621', {
- 	'tplink,eap615-wall-v1',
- }) then
- 	lan_ifname, wan_ifname = 'lan1 lan2 lan3', 'lan0'
-+elseif platform.match('ipq40xx', 'generic', {
-+	'avm,fritzbox-7530',
-+}) then
-+	lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1'
- elseif platform.match('lantiq', 'xrx200', {
+@@ -79,6 +79,21 @@ elseif platform.match('lantiq', 'xrx200', {
  	'arcadyan,vgv7510kw22-nor',
  }) then
  	lan_ifname, wan_ifname = 'lan1 lan2 lan3 lan4', 'wan'
diff --git a/patches/targets-ath79-generic.patch b/patches/targets-ath79-generic.patch
index 59c68ca..ba60956 100644
--- a/patches/targets-ath79-generic.patch
+++ b/patches/targets-ath79-generic.patch
@@ -1,35 +1,26 @@
 diff --git a/targets/ath79-generic b/targets/ath79-generic
-index af23bf6a..8b0ae548 100644
+index c41bf0db..17ee5e70 100644
 --- a/targets/ath79-generic
 +++ b/targets/ath79-generic
-@@ -506,6 +506,15 @@ device('tp-link-eap225-outdoor-v3', 'tplink_eap225-outdoor-v3', {
+@@ -471,6 +471,10 @@ device('tp-link-eap225-outdoor-v3', 'tplink_eap225-outdoor-v3', {
  	packages = ATH10K_PACKAGES_QCA9888,
  })
  
-+device('tp-link-eap225-outdoor-v3', 'tplink_eap225-outdoor-v3', {
-+	factory = false,
-+	packages = ATH10K_PACKAGES_QCA9888,
-+})
-+
 +device('tp-link-eap225-wall-v2', 'tplink_eap225-wall-v2', {
 +	packages = ATH10K_PACKAGES_QCA9888,
 +})
 +
  device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1')
+ 
  device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
- device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
-@@ -610,3 +619,14 @@ device('ubiquiti-unifi-swiss-army-knife-ultra', 'ubnt_uk-ultra', {
+@@ -548,3 +552,9 @@ device('ubiquiti-unifi-swiss-army-knife-ultra', 'ubnt_uk-ultra', {
  	factory = false,
  	packages = ATH10K_PACKAGES_QCA9880,
  })
 +
-+-- device('ubiquiti-rocket-5ac-lite', 'ubnt_rocket-5ac-lite', {
-+--	packages = ATH10K_PACKAGES_QCA9880,
-+-- })
-+
-+
 +-- Zyxel
 +
 +device('zyxel-nbg6616', 'zyxel_nbg6616', {
 +	packages = ATH10K_PACKAGES_QCA9880,
 +})
+\ No newline at end of file
diff --git a/patches/targets-ipq40xx-generic.patch b/patches/targets-ipq40xx-generic.patch
index 0543daf..149f904 100644
--- a/patches/targets-ipq40xx-generic.patch
+++ b/patches/targets-ipq40xx-generic.patch
@@ -1,5 +1,5 @@
 diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
-index 068f538b..6e7c8bd4 100644
+index 85509de7..b26de7ca 100644
 --- a/targets/ipq40xx-generic
 +++ b/targets/ipq40xx-generic
 @@ -14,6 +14,15 @@ local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
@@ -18,7 +18,7 @@ index 068f538b..6e7c8bd4 100644
  
  
  defaults {
-@@ -57,6 +66,23 @@ device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
+@@ -73,6 +82,23 @@ device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
  	factory = false,
  })
  
@@ -42,7 +42,7 @@ index 068f538b..6e7c8bd4 100644
  
  -- GL.iNet
  
-@@ -73,6 +99,36 @@ device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
+@@ -89,6 +115,36 @@ device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
  
  device('linksys-ea6350v3', 'linksys_ea6350v3')
  
@@ -79,7 +79,7 @@ index 068f538b..6e7c8bd4 100644
  
  -- Meraki
  
-@@ -80,6 +136,11 @@ device('meraki-mr33-access-point', 'meraki_mr33', {
+@@ -96,6 +152,11 @@ device('meraki-mr33-access-point', 'meraki_mr33', {
  	packages = {
  		-- radio0 is monitoring radio - removed for now
  		-- the -ct firmware does not have working mesh
@@ -91,7 +91,7 @@ index 068f538b..6e7c8bd4 100644
  		'-ath10k-firmware-qca9887-ct',
  		'-ath10k-board-qca9887',
  	},
-@@ -123,6 +184,7 @@ device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
+@@ -139,6 +200,7 @@ device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
  -- ZTE
  
  device('zte-mf289f', 'zte_mf289f', {
diff --git a/patches/targets-lantiq-xrx200-devices.patch b/patches/targets-lantiq-xrx200-devices.patch
index da17e13..18e90d0 100644
--- a/patches/targets-lantiq-xrx200-devices.patch
+++ b/patches/targets-lantiq-xrx200-devices.patch
@@ -1,8 +1,8 @@
-diff --git a/patches/openwrt/0008-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch b/patches/openwrt/0008-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch
+diff --git a/patches/openwrt/0007-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch b/patches/openwrt/0007-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch
 new file mode 100644
 index 00000000..9b7a21f9
 --- /dev/null
-+++ b/patches/openwrt/0008-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch
++++ b/patches/openwrt/0007-lantiq-fix-ath9k-eeprom-for-AVM-Fritz-Box-7430.patch
 @@ -0,0 +1,53 @@
 +From: Felix Baumann <felix.bau@gmx.de>
 +Date: Tue, 28 Feb 2023 04:21:07 +0100
@@ -58,10 +58,10 @@ index 00000000..9b7a21f9
 + 				caldata_extract_ubi "caldata" 0x1000 0x1000
 + 				ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) 2) 0x10c
 diff --git a/targets/lantiq-xrx200 b/targets/lantiq-xrx200
-index f54cd87f..80f0659d 100644
+index 744fdea4..16672c91 100644
 --- a/targets/lantiq-xrx200
 +++ b/targets/lantiq-xrx200
-@@ -30,6 +30,10 @@ device('avm-fritz-box-3370-rev-2-micron-nand', 'avm_fritz3370-rev2-micron', {
+@@ -33,6 +33,10 @@ device('avm-fritz-box-3370-rev-2-micron-nand', 'avm_fritz3370-rev2-micron', {
  	broken = true, -- no button for setup mode; hw revision not visible on device
  })
  
@@ -72,7 +72,7 @@ index f54cd87f..80f0659d 100644
  device('avm-fritz-box-7360-sl', 'avm_fritz7360sl', {
  	factory = false,
  	aliases = {'avm-fritz-box-7360-v1'},
-@@ -47,6 +51,10 @@ device('avm-fritz-box-7412', 'avm_fritz7412', {
+@@ -50,6 +54,10 @@ device('avm-fritz-box-7412', 'avm_fritz7412', {
  	factory = false,
  })
  
diff --git a/patches/targets-mediatek-mt7622.patch b/patches/targets-mediatek-mt7622.patch
index 41c604a..bdec74d 100644
--- a/patches/targets-mediatek-mt7622.patch
+++ b/patches/targets-mediatek-mt7622.patch
@@ -1,9 +1,9 @@
 diff --git a/targets/mediatek-mt7622 b/targets/mediatek-mt7622
-index 8376c397..5c75ac21 100644
+index 81440d50..389c77a9 100644
 --- a/targets/mediatek-mt7622
 +++ b/targets/mediatek-mt7622
-@@ -11,6 +11,22 @@ device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', {
- 	manifest_aliases = {'ubiquiti-unifi-6-lr'},
+@@ -13,3 +13,18 @@ device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', {
+ 	manifest_aliases = {'ubiquiti-unifi-6-lr'}, -- Upgrade from OpenWrt 22.03
  })
  
 +device('ubiquiti-unifi-6-lr-v2', 'ubnt_unifi-6-lr-v2', {
@@ -21,7 +21,3 @@ index 8376c397..5c75ac21 100644
 +	factory_ext = '.img',
 +})
 +
-+
- -- Xiaomi
- 
- device('xiaomi-redmi-router-ax6s', 'xiaomi_redmi-router-ax6s', {
diff --git a/patches/targets-mk.patch b/patches/targets-mk.patch
index c2f3d09..e278dcf 100644
--- a/patches/targets-mk.patch
+++ b/patches/targets-mk.patch
@@ -1,12 +1,13 @@
 diff --git a/targets/targets.mk b/targets/targets.mk
-index 14955134..7a5a9b2e 100644
+index 20224a06..eca0fcc0 100644
 --- a/targets/targets.mk
 +++ b/targets/targets.mk
-@@ -29,5 +29,7 @@ $(eval $(call GluonTarget,x86,64))
+@@ -29,6 +29,8 @@ $(eval $(call GluonTarget,x86,64))
  ifeq ($(BROKEN),1)
  $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
  $(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
 +$(eval $(call GluonTarget,ipq40xx,chromium)) # BROKEN: Untested
 +$(eval $(call GluonTarget,ipq807x,generic)) # BROKEN: Untested
+ $(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: 11s support untested
  $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
  endif
diff --git a/patches/targets-ramips-mt7621.patch b/patches/targets-ramips-mt7621.patch
index a8a5540..8663feb 100644
--- a/patches/targets-ramips-mt7621.patch
+++ b/patches/targets-ramips-mt7621.patch
@@ -1,8 +1,8 @@
 diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
-index 01b9b94c..630fd7ab 100644
+index f58a26c5..540f7ae9 100644
 --- a/targets/ramips-mt7621
 +++ b/targets/ramips-mt7621
-@@ -22,6 +22,10 @@ device('cudy-wr2100', 'cudy_wr2100', {
+@@ -23,6 +23,10 @@ device('cudy-wr2100', 'cudy_wr2100', {
  	factory = false,
  })
  
@@ -13,7 +13,7 @@ index 01b9b94c..630fd7ab 100644
  device('cudy-x6-v1', 'cudy_x6-v1', {
  	factory = false,
  })
-@@ -89,6 +93,8 @@ device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
+@@ -87,6 +91,8 @@ device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
  
  -- TP-Link
  
@@ -22,7 +22,7 @@ index 01b9b94c..630fd7ab 100644
  device('tp-link-archer-c6-v3', 'tplink_archer-c6-v3', {
  	broken = true, -- LAN LED not working - review after resolving #2756
  })
-@@ -106,6 +112,10 @@ device('ubiquiti-unifi-6-lite', 'ubnt_unifi-6-lite', {
+@@ -104,6 +110,10 @@ device('ubiquiti-unifi-6-lite', 'ubnt_unifi-6-lite', {
  	factory = false,
  })
  
@@ -33,7 +33,7 @@ index 01b9b94c..630fd7ab 100644
  
  -- Wavlink
  
-@@ -162,6 +172,15 @@ device('zyxel-wsm20', 'zyxel_wsm20', {
+@@ -153,6 +163,15 @@ device('zyxel-wsm20', 'zyxel_wsm20', {
  
  -- Devices without WLAN
  
diff --git a/release.mk b/release.mk
index 31c88c6..2df9f6d 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_URL := https://github.com/ffac/gluon.git
+GLUON_GIT_REF := 508eda77cbf0146f7069ad584be646e3553f3020 # next
diff --git a/site.conf b/site.conf
index 6e92f8f..3f3fbb7 100644
--- a/site.conf
+++ b/site.conf
@@ -221,9 +221,9 @@
 			stable = {
 				name = 'stable',
 				mirrors = {
-					'http://updates.freifunk-aachen.de/from-2023.2.x/stable/sysupgrade',
-					'http://updates.ffac.rocks/from-2023.2.x/stable/sysupgrade',
-					'http://updates.aachen.freifunk.net/from-2023.2.x/stable/sysupgrade',
+					'http://updates.freifunk-aachen.de/from-2024.1.x/stable/sysupgrade',
+					'http://updates.ffac.rocks/from-2024.1.x/stable/sysupgrade',
+					'http://updates.aachen.freifunk.net/from-2024.1.x/stable/sysupgrade',
 				},
 				good_signatures = 4,
 				pubkeys = {
@@ -241,9 +241,9 @@
 			beta = {
 				name = 'beta',
 				mirrors = {
-					'http://updates.freifunk-aachen.de/from-2023.2.x/beta/sysupgrade',
-					'http://updates.ffac.rocks/from-2023.2.x/beta/sysupgrade',
-					'http://updates.aachen.freifunk.net/from-2023.2.x/beta/sysupgrade',
+					'http://updates.freifunk-aachen.de/from-2024.1.x/beta/sysupgrade',
+					'http://updates.ffac.rocks/from-2024.1.x/beta/sysupgrade',
+					'http://updates.aachen.freifunk.net/from-2024.1.x/beta/sysupgrade',
 				},
 				good_signatures = 3,
 				pubkeys = {
@@ -261,9 +261,9 @@
 			experimental = {
 				name = 'experimental',
 				mirrors = {
-					'http://updates.freifunk-aachen.de/from-2023.2.x/experimental/sysupgrade',
-					'http://updates.ffac.rocks/from-2023.2.x/experimental/sysupgrade',
-					'http://updates.aachen.freifunk.net/from-2023.2.x/experimental/sysupgrade',
+					'http://updates.freifunk-aachen.de/from-2024.1.x/experimental/sysupgrade',
+					'http://updates.ffac.rocks/from-2024.1.x/experimental/sysupgrade',
+					'http://updates.aachen.freifunk.net/from-2024.1.x/experimental/sysupgrade',
 				},
 				good_signatures = 2,
 				pubkeys = {