diff --git a/image-customization.lua b/image-customization.lua
index 8b60e5f..aa4abd3 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -21,9 +21,10 @@ packages{
     'ffac-change-autoupdater',
     'ffac-ssid-changer',
     'ffbs-collect-debug-info',
-    'gluon-ffbsnext-nodeconfig',
-    'gluon-ffbsnext-nodeconfig-respondd',
-    'gluon-ffbsnext-nextnode',
+    'ffbs-parker-nextnode',
+    'ffbs-parker-nodeconfig-respondd',
+    'ffbs-parker-nodeconfig',
+    'ffbs-wireguard-respondd',
     '-gluon-ebtables-limit-arp',
     'iwinfo',
     'kmod-nat46',
diff --git a/modules b/modules
index 240352b..3796943 100644
--- a/modules
+++ b/modules
@@ -8,9 +8,9 @@
 #		documented below
 GLUON_SITE_FEEDS='community packages_ffbs'
 
-PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=61ba5ab54ffd34a77ec4967487f69848d553fcc0
-PACKAGES_COMMUNITY_BRANCH=master
+PACKAGES_COMMUNITY_REPO=https://github.com/SmithChart/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=163b332513c523eda0672a1ce155fae690431e81
+PACKAGES_COMMUNITY_BRANCH=topic/parker
 
 PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
 PACKAGES_PACKAGES_FFBS_COMMIT=e378f415b42e0ea9744397f5b349fbe0ee9c7394