diff --git a/modules b/modules
index e5f7861d4f7e1a8583c5eae782e946fa7a078027..85d1bc51e737d5c771cf161987521b1989c83ca1 100644
--- a/modules
+++ b/modules
@@ -4,12 +4,13 @@ OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
 OPENWRT_COMMIT=1efcdb2446602c3b120b265c1d189039fdb9c0e7
 
-PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
+PACKAGES_GLUON_REPO=https://gitli.stratum0.org/ffbs/packages.git
+PACKAGES_GLUON_COMMIT=953a6a9dde028491e1eba4a85d4ca2ebbf3d1bc0
+PACKAGES_GLUON_BRANCH=v2023.2.x-ffbs-next
 
-PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
-PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=c691e6f4c7ea2b40909270e4523b0fa6dcfbb9ae
+PACKAGES_PACKAGES_REPO=https://gitli.stratum0.org/ffbs/openwrt-packages.git
+PACKAGES_PACKAGES_BRANCH=openwrt-23.05-ffbs-next
+PACKAGES_PACKAGES_COMMIT=ca2ff667e28e03d1b24a92696449f77b63e6dbf2
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05