diff --git a/image-customization.lua b/image-customization.lua
index 7a47b7bfffff3b6efd16644564aa57745207576e..477c936f6826c8c6c8bd04f5137cd7285ce142aa 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -30,7 +30,6 @@ packages({
 	'kmod-wireguard',
 	'gluon-ffbsnext-nodeconfig',
 	'gluon-ffbsnext-nodeconfig-respondd',
-	'gluon-ffbs-debugbathosts',
 	'gluon-ffbsnext-debugrsyslog',
 	'gluon-ffbsnext-nextnode',
 	'gluon-ffbsnext-info-pull',
@@ -43,6 +42,8 @@ packages({
 	'respondd-module-airtime',
 	'gluon-radv-filterd',
 	'kmod-nlmon',
+	'ffbs-debugbathosts',
+	'ffbs-collect-debug-info',
 })
 
 -- support acpi shutdown for openwrt as VM
diff --git a/modules b/modules
index f3e1c018503a24f7eb69fb1519f712bf624b07a0..a003b1d0bab1b4c1f9fcbfbe35b71f2e7ffcfa32 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,9 @@
-GLUON_SITE_FEEDS='packages_ffbs'
+GLUON_SITE_FEEDS='packages_ffbs gluon_community'
+
 PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
 PACKAGES_PACKAGES_FFBS_COMMIT=fe1d306578553f8c13a7fb63928aec909a9c6092
 PACKAGES_PACKAGES_FFBS_BRANCH=v2023.2.x-ffbs-next
+
+PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_GLUON_COMMUNITY_COMMIT=39a38b6f3b530607fa70114dad80434457ecf5e0
+PACKAGES_GLUON_COMMUNITY_BRANCH=master