diff --git a/.github/workflows/build-secubox-images.yml b/.github/workflows/build-secubox-images.yml
index 5f3aa77c..52a83e2e 100644
--- a/.github/workflows/build-secubox-images.yml
+++ b/.github/workflows/build-secubox-images.yml
@@ -281,39 +281,39 @@ jobs:
         if: ${{ github.event.inputs.include_secubox == 'true' }}
         run: |
           cd openwrt
-          
-          # CrowdSec
+
           cat >> .config << EOF
+          # SecuBox packages - Core
+          CONFIG_PACKAGE_luci-app-secubox=y
+          CONFIG_PACKAGE_luci-app-system-hub=y
+
+          # SecuBox packages - Security & Monitoring
           CONFIG_PACKAGE_crowdsec=y
           CONFIG_PACKAGE_crowdsec-firewall-bouncer=y
           CONFIG_PACKAGE_luci-app-crowdsec-dashboard=y
-          EOF
-          
-          # Netdata
-          cat >> .config << EOF
           CONFIG_PACKAGE_netdata=y
           CONFIG_PACKAGE_luci-app-netdata-dashboard=y
-          EOF
-          
-          # Netifyd
-          cat >> .config << EOF
+
+          # SecuBox packages - Network Intelligence
           CONFIG_PACKAGE_netifyd=y
           CONFIG_PACKAGE_luci-app-netifyd-dashboard=y
-          EOF
-          
-          # WireGuard
-          cat >> .config << EOF
+          CONFIG_PACKAGE_luci-app-network-modes=y
+
+          # SecuBox packages - VPN & Access Control
           CONFIG_PACKAGE_wireguard-tools=y
           CONFIG_PACKAGE_kmod-wireguard=y
           CONFIG_PACKAGE_luci-app-wireguard-dashboard=y
           CONFIG_PACKAGE_qrencode=y
-          EOF
-          
-          # SecuBox core
-          cat >> .config << EOF
-          CONFIG_PACKAGE_luci-app-network-modes=y
           CONFIG_PACKAGE_luci-app-client-guardian=y
-          CONFIG_PACKAGE_luci-app-system-hub=y
+          CONFIG_PACKAGE_luci-app-auth-guardian=y
+
+          # SecuBox packages - Bandwidth & Traffic
+          CONFIG_PACKAGE_luci-app-bandwidth-manager=y
+          CONFIG_PACKAGE_luci-app-media-flow=y
+
+          # SecuBox packages - Performance & Services
+          CONFIG_PACKAGE_luci-app-cdn-cache=y
+          CONFIG_PACKAGE_luci-app-vhost-manager=y
           EOF
 
       - name: Add device-specific packages
diff --git a/secubox-tools/local-build.sh b/secubox-tools/local-build.sh
index eec04315..ab8bd0a1 100755
--- a/secubox-tools/local-build.sh
+++ b/secubox-tools/local-build.sh
@@ -962,14 +962,30 @@ CONFIG_PACKAGE_kmod-usb-storage=y
 CONFIG_PACKAGE_kmod-fs-ext4=y
 CONFIG_PACKAGE_kmod-fs-vfat=y
 
-# SecuBox packages
+# SecuBox packages - Core
+CONFIG_PACKAGE_luci-app-secubox=y
 CONFIG_PACKAGE_luci-app-system-hub=y
-CONFIG_PACKAGE_luci-app-network-modes=y
-CONFIG_PACKAGE_luci-app-wireguard-dashboard=y
+
+# SecuBox packages - Security & Monitoring
 CONFIG_PACKAGE_luci-app-crowdsec-dashboard=y
 CONFIG_PACKAGE_luci-app-netdata-dashboard=y
+
+# SecuBox packages - Network Intelligence
 CONFIG_PACKAGE_luci-app-netifyd-dashboard=y
+CONFIG_PACKAGE_luci-app-network-modes=y
+
+# SecuBox packages - VPN & Access Control
+CONFIG_PACKAGE_luci-app-wireguard-dashboard=y
 CONFIG_PACKAGE_luci-app-client-guardian=y
+CONFIG_PACKAGE_luci-app-auth-guardian=y
+
+# SecuBox packages - Bandwidth & Traffic
+CONFIG_PACKAGE_luci-app-bandwidth-manager=y
+CONFIG_PACKAGE_luci-app-media-flow=y
+
+# SecuBox packages - Performance & Services
+CONFIG_PACKAGE_luci-app-cdn-cache=y
+CONFIG_PACKAGE_luci-app-vhost-manager=y
 
 # WireGuard
 CONFIG_PACKAGE_wireguard-tools=y