diff --git a/README.md b/README.md
index 2f294b2bb..171092c3d 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,6 @@ net/haproxy -- Reliable, high performance TCP/HTTP load balancer
 net/igmp-proxy -- IGMP-Proxy Service
 net/mdns-repeater -- Proxy multicast DNS between networks
 net/ndproxy -- Neighbor Discovery Proxy
-net/netbird -- Peer-to-peer VPN that seamlessly connects your devices (development only)
 net/ntopng -- Traffic Analysis and Flow Collection
 net/radsecproxy -- RADIUS proxy provides both RADIUS UDP and TCP/TLS (RadSec) transport
 net/realtek-re -- Realtek re(4) vendor driver
@@ -88,6 +87,7 @@ security/intrusion-detection-content-et-pro -- IDS Proofpoint ET Pro ruleset (ne
 security/intrusion-detection-content-pt-open -- IDS Positive Technologies ESC ruleset
 security/intrusion-detection-content-snort-vrt -- IDS Snort VRT ruleset (needs registration or subscription)
 security/maltrail -- Malicious traffic detection system
+security/netbird -- Peer-to-peer VPN that seamlessly connects your devices (development only)
 security/openconnect -- OpenConnect Client
 security/openvpn-legacy -- OpenVPN legacy support
 security/softether -- Cross-platform Multi-protocol VPN Program (development only)
diff --git a/net/netbird/Makefile b/security/netbird/Makefile
similarity index 100%
rename from net/netbird/Makefile
rename to security/netbird/Makefile
diff --git a/net/netbird/pkg-descr b/security/netbird/pkg-descr
similarity index 100%
rename from net/netbird/pkg-descr
rename to security/netbird/pkg-descr
diff --git a/net/netbird/src/etc/inc/plugins.inc.d/netbird.inc b/security/netbird/src/etc/inc/plugins.inc.d/netbird.inc
similarity index 100%
rename from net/netbird/src/etc/inc/plugins.inc.d/netbird.inc
rename to security/netbird/src/etc/inc/plugins.inc.d/netbird.inc
diff --git a/net/netbird/src/etc/rc.syshook.d/carp/30-netbird b/security/netbird/src/etc/rc.syshook.d/carp/30-netbird
similarity index 100%
rename from net/netbird/src/etc/rc.syshook.d/carp/30-netbird
rename to security/netbird/src/etc/rc.syshook.d/carp/30-netbird
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml
diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml
rename to security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php
diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml
rename to security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml
diff --git a/net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt b/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt
rename to security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt
diff --git a/net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt b/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt
similarity index 100%
rename from net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt
rename to security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt
diff --git a/net/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh b/security/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh
similarity index 100%
rename from net/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh
rename to security/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh
diff --git a/net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf b/security/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf
similarity index 100%
rename from net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf
rename to security/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf
diff --git a/net/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS b/security/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS
similarity index 100%
rename from net/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS
rename to security/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS
diff --git a/net/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird b/security/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird
similarity index 100%
rename from net/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird
rename to security/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird
diff --git a/net/netbird/src/opnsense/service/templates/OPNsense/Syslog/local/netbird.conf b/security/netbird/src/opnsense/service/templates/OPNsense/Syslog/local/netbird.conf
similarity index 100%
rename from net/netbird/src/opnsense/service/templates/OPNsense/Syslog/local/netbird.conf
rename to security/netbird/src/opnsense/service/templates/OPNsense/Syslog/local/netbird.conf