diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile
index f7b76bda5d7c..f8edc9d82be7 100644
--- a/databases/pg-gvm/Makefile
+++ b/databases/pg-gvm/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	pg-gvm
 DISTVERSION=	22.6.1
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	databases devel
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Library for helper functions in PostgreSQL
 WWW=		https://github.com/greenbone/pg-gvm
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libical.so:devel/libical
 
 USES=		cmake gnome pkgconfig pgsql
 USE_GNOME=	glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	pg-gvm
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find -type f|find * -type f|g' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/security/gsad/Makefile b/security/gsad/Makefile
index b071d3e32f86..b2931a4363b0 100644
--- a/security/gsad/Makefile
+++ b/security/gsad/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	gsad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	22.6.0
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Security Assistant HTTP server
 WWW=		https://github.com/greenbone/gsad
 
 LICENSE=	AGPLv3+
 
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgnutls.so:security/gnutls \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libmicrohttpd.so:www/libmicrohttpd
 RUN_DEPENDS=	doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR}
 
 USES=		cmake gettext-runtime gnome pkgconfig python
 USE_GNOME=	glib20 libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	gsad
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	gsad
 
 LDFLAGS+=	-lm
 
 ETCDIR=		${PREFIX}/etc/gvm
 
 post-extract:
 	@${MV} ${WRKSRC}/src/gsad_log_conf.cmake_in ${WRKSRC}/src/gsad_log.conf.sample
 
 post-patch:
 	${REINPLACE_CMD} -e 's|$${GVM_LOG_DIR}|/var/log/gvm|g' ${WRKSRC}/src/gsad_log.conf.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/gsad
 	@${MKDIR} ${STAGEDIR}/var/run/gvm
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/src/gsad_log.conf.sample ${STAGEDIR}${ETCDIR}
 
 	@${ECHO_CMD} "@sample etc/gvm/gsad_log.conf.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "sbin/gsad" >> ${TMPPLIST} >> ${TMPPLIST}
 	@${ECHO_CMD} "share/man/man8/gsad.8.gz" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gsad" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gvm" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index 16be6138d866..5af1f1766dcc 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	gvm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	22.7.1
+DISTVERSION=	22.7.3
 CATEGORIES=	security
 PKGNAMESUFFIX=	-libs
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Libraries module for the GVM solution
 WWW=		https://github.com/greenbone/gvm-libs
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	doxygen>0:devel/doxygen
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpgme.so:security/gpgme \
 		libgpg-error.so:security/libgpg-error \
 		libgnutls.so:security/gnutls \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libssh.so:security/libssh \
 		libhiredis.so:databases/hiredis \
 		libnet.so:net/libnet \
 		libgcrypt.so:security/libgcrypt \
 		libpaho-mqtt3a.so:net/libpaho-mqtt3
 RUN_DEPENDS=	doxygen>0:devel/doxygen
 
 USES=		cmake gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	LDAP RADIUS
 
 LDAP_CMAKE_ON=		-DBUILD_WITH_LDAP=1
 LDAP_CMAKE_OFF=		-DBUILD_WITH_LDAP=0
 LDAP_USES=		ldap
 RADIUS_CMAKE_ON=	-DBUILD_WITH_RADIUS=1
 RADIUS_CMAKE_OFF=	-DBUILD_WITH_RADIUS=0
 RADIUS_LIB_DEPENDS=	libfreeradius-client.so:net/freeradius-client
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.25.0|1.45.6|g' ${WRKSRC}/util/libgvm_util.pc.in
 	@${REINPLACE_CMD} -e 's|uuid>=2.25.0|uuid>=1.45.6|g' ${WRKSRC}/util/CMakeLists.txt
 	@${REINPLACE_CMD} '17d' ${WRKSRC}/base/proctitle.c
 
 .include <bsd.port.mk>
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
index 9ce47deecc8a..13c053cbc31c 100644
--- a/security/gvm-libs/distinfo
+++ b/security/gvm-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695258196
-SHA256 (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = e016e9d16a2cf2cdd0c8b928c2d52be1468962870f93a1b82e4af737480644b5
-SIZE (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = 309225
+TIMESTAMP = 1697841226
+SHA256 (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = af081e5cca0736063076246282a416fba016131f44f7407b2702ae7dfb96016d
+SIZE (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = 309842
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
index f095afdcae1a..d6e29dcfb917 100644
--- a/security/gvm-libs/pkg-plist
+++ b/security/gvm-libs/pkg-plist
@@ -1,61 +1,61 @@
 include/gvm/base/array.h
 include/gvm/base/credentials.h
 include/gvm/base/cvss.h
 include/gvm/base/drop_privileges.h
 include/gvm/base/gvm_sentry.h
 include/gvm/base/hosts.h
 include/gvm/base/logging.h
 include/gvm/base/networking.h
 include/gvm/base/nvti.h
 include/gvm/base/pidfile.h
 include/gvm/base/prefs.h
 include/gvm/base/proctitle.h
 include/gvm/base/pwpolicy.h
 include/gvm/base/settings.h
 include/gvm/base/strings.h
 include/gvm/base/version.h
 include/gvm/boreas/alivedetection.h
 include/gvm/boreas/arp.h
 include/gvm/boreas/boreas_error.h
 include/gvm/boreas/boreas_io.h
 include/gvm/boreas/cli.h
 include/gvm/boreas/ping.h
 include/gvm/boreas/sniffer.h
 include/gvm/boreas/util.h
 include/gvm/gmp/gmp.h
 include/gvm/osp/osp.h
 include/gvm/util/authutils.h
 include/gvm/util/compressutils.h
 include/gvm/util/fileutils.h
 include/gvm/util/gpgmeutils.h
 include/gvm/util/kb.h
 include/gvm/util/ldaputils.h
 include/gvm/util/mqtt.h
 include/gvm/util/nvticache.h
 include/gvm/util/passwordbasedauthentication.h
 include/gvm/util/radiusutils.h
 include/gvm/util/serverutils.h
 include/gvm/util/sshutils.h
 include/gvm/util/uuidutils.h
 include/gvm/util/xmlutils.h
 lib/libgvm_base.so
 lib/libgvm_base.so.22
-lib/libgvm_base.so.22.7.1
+lib/libgvm_base.so.22.7.3
 lib/libgvm_boreas.so
 lib/libgvm_boreas.so.22
-lib/libgvm_boreas.so.22.7.1
+lib/libgvm_boreas.so.22.7.3
 lib/libgvm_gmp.so
 lib/libgvm_gmp.so.22
-lib/libgvm_gmp.so.22.7.1
+lib/libgvm_gmp.so.22.7.3
 lib/libgvm_osp.so
 lib/libgvm_osp.so.22
-lib/libgvm_osp.so.22.7.1
+lib/libgvm_osp.so.22.7.3
 lib/libgvm_util.so
 lib/libgvm_util.so.22
-lib/libgvm_util.so.22.7.1
+lib/libgvm_util.so.22.7.3
 libdata/pkgconfig/libgvm_base.pc
 libdata/pkgconfig/libgvm_boreas.pc
 libdata/pkgconfig/libgvm_gmp.pc
 libdata/pkgconfig/libgvm_osp.pc
 libdata/pkgconfig/libgvm_util.pc
 @dir /var/run/gvm
diff --git a/security/gvm/Makefile b/security/gvm/Makefile
index f3d65c9a0541..43dc6e55d07e 100644
--- a/security/gvm/Makefile
+++ b/security/gvm/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	gvm
 PORTVERSION=	22.9.0
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone vulnerability management (metaport)
 WWW=		https://www.openvas.org/
 
 USES=		metaport python
 
 # Install GVM libraries
 RUN_DEPENDS+=	${LOCALBASE}/lib/libgvm_base.so:security/gvm-libs
 
 # Install GVM Manager
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gvmd:security/gvmd
 
 # Install Scanner wrapper for OSP
 RUN_DEPENDS+=	${LOCALBASE}/bin/ospd-openvas:security/py-ospd-openvas@${PY_FLAVOR}
 
 # Install OpenVAS Scanner
 RUN_DEPENDS+=   ${LOCALBASE}/sbin/openvas:security/openvas
 
 # Install Notus Scanner
 RUN_DEPENDS+=	${LOCALBASE}/bin/notus-scanner:security/py-notus-scanner
 
 # Install Greenbone Community Feed
 RUN_DEPENDS+=	greenbone-feed-sync:security/py-greenbone-feed-sync@${PY_FLAVOR}
 
 # Install GVM Web Interface
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gsad:security/gsad
 RUN_DEPENDS+=	${LOCALBASE}/share/gvm/gsad/web/index.html:security/gsa
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		PYTHON-GVM GVM-TOOLS
 OPTIONS_DEFAULT=	PYTHON-GVM GVM-TOOLS
 
 PYTHON-GVM_DESC=	Install GVM python API library
 GVM-TOOLS_DESC=		Install GVM tools
 
 PYTHON-GVM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gvm>=0:security/py-python-gvm@${PY_FLAVOR}
 GVM-TOOLS_RUN_DEPENDS=	gvm-cli:security/py-gvm-tools@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/gvm/files/pkg-message.in b/security/gvm/files/pkg-message.in
index 28cac7be226f..0911c6ce7785 100644
--- a/security/gvm/files/pkg-message.in
+++ b/security/gvm/files/pkg-message.in
@@ -1,170 +1,170 @@
 [
 { type: install
   message: <<EOM
 GVM ports were installed
 
 If you are migrating to new version do not forget do the following:
 
   # su -m gvm -c "gvmd --migrate"
 
 Basic instructions for configure your gvm infraestruture are following:
 
 1) Redis is a dependency of GVM. Please, configure redis-server for 
    listening on socket /var/run/redis/redis.sock. security/openvas scanner 
    needs it
 
   # echo "db_address = /var/run/redis/redis.sock" > /usr/local/etc/openvas/openvas.conf
 
 2) Mosquitto broker is a new dependency of GVM. Please configure net/mosquitto
    service and add the following line to openvas configuration file
 
   # echo "mqtt_server_uri = localhost:1883" >> /usr/local/etc/openvas/openvas.conf
 
 3) security/py-notus-scanner is a new tool used by GVM. You must create a
    notus-scanner.toml configuration file at usr/local/etc/gvm/ directory
 
    # echo "[notus-scanner]" > /usr/local/etc/gvm/notus-scanner.toml
    # echo 'mqtt-broker-address = "localhost"' >> /usr/local/etc/gvm/notus-scanner.toml
    # echo 'mqtt-broker-port = "1883"' >> /usr/local/etc/gvm/notus-scanner.toml
-   # echo 'products-directory = "/var/lib/openvas/plugins/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml
+   # echo 'products-directory = "/var/lib/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml
    # echo 'log-level = "INFO"' >> /usr/local/etc/gvm/notus-scanner.toml
    # echo "disable-hashsum-verification = false" >> /usr/local/etc/gvm/notus-scanner.toml
 
    Otherwise it can be defined into notus-scanner startup script. Take a look at 
    /usr/local/etc/rc.d/notus-scanner file
 
 4) Add user gvm to redis group
 
   # pw groupmod redis -M gvm
 
-5) security/gvmd uses PostgreSQL database. Generally, PostgreSQL must be 
-   installed in the same server where security/gvmd is running: 
+5) security/gvmd uses PostgreSQL database (server and contrib). Generally, 
+   PostgreSQL must be installed in the same server where security/gvmd is running: 
 
   # su postgres
   # createuser -DRS gvm
   # createdb -O gvm gvmd
   # psql gvmd
   # create role dba with superuser noinherit;
   # grant dba to gvm;
   # create extension "uuid-ossp";
   # create extension "pgcrypto";
   # create extension "pg-gvm";
 
 6) Add the following lines to /etc/rc.conf
 
   # sysrc redis_enable="YES"
   # sysrc gvmd_enable="YES"
   # sysrc ospd_openvas_enable="YES"
   # sysrc notus_scanner_enable="YES"
   # sysrc gsad_enable="YES"
 
 7) Start redis service
 
   # service redis start
 
 8) Currently, ospd_openvas should run as a user without elevated privileges 
    (gvm) and use sudo for run openvas scanner but it does not work properly. 
    Like a workaround you must run redis as root and the same with ospd_openvas.
 
    Add the following lines to /etc/rc.conf
 
    redis_user="root"
    ospd_openvas_user="root"
 
    Take in mind it is not the best configuration for run ospd_openvas and
    openvas.
 
    The following could avoid some scan issues with openvas
 
    # echo "test_alive_hosts_only = no" >> /usr/local/etc/openvas/openvas.conf
 
 9) The following steps are neccessary before of you can access to GVM web 
    interface (gsad):
 
   Create certificates
 
   # su -m gvm -c "gvm-manage-certs -a"
 
   Sync gvmd Data, SCAP, CERT and NVT
 
   # su -m gvm -c "greenbone-nvt-sync"
   # su -m gvm -c "greenbone-feed-sync --type GVMD_DATA"
   # su -m gvm -c "greenbone-feed-sync --type SCAP"
   # su -m gvm -c "greenbone-feed-sync --type CERT"
 
   Start gvmd service. It will listen on /var/run/gvmd/gvmd.sock by default
 
   # service gvmd start
 
   Create an admin user and set the Feed Import Owner
 
   # su -m gvm -c "gvmd --create-user=myuser"
   # su -m gvm -c "gvmd --user=myuser --new-password=yourpassword"
 
   Set the Feed Import Owner (myuser user in this example)
 
   # su -m gvm -c "gvmd --get-users --verbose"
   myuser <uuid_of_user>
    
   # su -m gvm -c "gvmd --modify-setting 78eceaec-3385-11ea-b237-28d24461215b --value <uuid_of_user>
 
 10) Start OSPD-OpenVAS Wrapper service. It will listen on /var/run/ospd/ospd.sock by default
 
   # service ospd_openvas start
 
   you can test if ospd_openvas is connecting with openvas scanner with the following commands:
 
   # su -m gvm -c "gvmd --get-scanners"
   6acd0832-df90-11e4-b9d5-28d24461215b  CVE    0  CVE
   08b69003-5fc2-4037-a479-93b440211c73  OpenVAS  /var/run/ospd/ospd.sock  0  OpenVAS Default
 
   # su -m gvm -c "gvmd --verify-scanner=08b69003-5fc2-4037-a479-93b440211c73"
   Scanner version: OpenVAS x.x.x
 
 11) Start Notus Scanner service
 
   # service notus_scanner start
 
 12) Start GVM web interface. It will listen on http://127.0.0.1 by default
 
   # service gsad start
 
 13) Some openvas scanner tasks  need access to /dev/bpf device. Add the 
    following lines to /etc/devfs.conf
 
    own     bpf     root:gvm
    perm    bpf     0660
 
    And restart service for apply the changes
 
    # service devfs restart
 
 14) gvm log files are stores to /var/log/gvm directory
 
 15) gsad can export results to PDF. It needs print/texlive-texmf port
   
   # pkg install texlive-texmf
 
   It will install 1G of data
 
 16) If you need more configure information you can look at the following links:
 
    https://github.com/greenbone/gvmd/blob/master/INSTALL.md
    https://github.com/greenbone/openvas/blob/master/INSTALL.md
    https://github.com/greenbone/ospd/blob/master/doc/INSTALL-ospd-scanner.md
    https://github.com/greenbone/gsa/blob/master/INSTALL.md
    https://github.com/greenbone/greenbone-feed-sync/blob/main/README.md
    https://greenbone.github.io/docs/latest/index.html
 
    and
 
    # gvmd -h
    # openvas -h
    # ospd-openvas -h
    # notus-scanner -h
    # gsad -h
 
 14) Enjoy it
 EOM
 }
 ]
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index 59f681be8023..d08fb69af923 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	gvmd
 DISTVERSION=	22.9.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone Vulnerability Manager central management service
 WWW=		https://github.com/greenbone/gvmd
 
 LICENSE=	AGPLv3+
 
 BUILD_DEPENDS=	doxygen>0:devel/doxygen
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgnutls.so:security/gnutls \
 		libgpgme.so:security/gpgme \
 		libical.so:devel/libical
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${LOCALBASE}/lib/postgresql/libpg-gvm.so:databases/pg-gvm \
 		doxygen>0:devel/doxygen \
 		p5-XML-Twig>=0:textproc/p5-XML-Twig \
 		snmpget:net-mgmt/net-snmp \
 		rsync:net/rsync \
 		wget:ftp/wget \
 		gpg:security/gnupg \
 		xml:textproc/xmlstarlet \
 		sshpass:security/sshpass \
 		socat:net/socat \
 		zip:archivers/zip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 
 USES=		cmake gnome pkgconfig pgsql python samba:run shebangfix
 USE_GNOME=	glib20 libxslt:build
 USE_LDCONFIG=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	gvmd
 
 SHEBANG_FILES=	tools/gvm-lsc-rpm-creator \
 		tools/gvm-lsc-deb-creator \
 		src/alert_methods/TippingPoint/report-convert.py \
 		src/alert_methods/SCP/alert \
 		src/alert_methods/SMB/alert
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/manage_sql.c
 	${REINPLACE_CMD} -e 's|+660|660|g' ${WRKSRC}/tools/greenbone-feed-sync.in
 	${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/manage.c \
 		${WRKSRC}/src/gvmd.c ${WRKSRC}/src/manage_sql_secinfo.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg
 	@${MKDIR} ${STAGEDIR}/var/log/gvm
 	@${MKDIR} ${STAGEDIR}/var/run/gvmd
 
 .include <bsd.port.mk>
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index d7c25436dd29..93e2b40529ba 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	openvas
-DISTVERSION=	22.7.5
+DISTVERSION=	22.7.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Open vulnerability assessment scanner
 WWW=		https://github.com/greenbone/openvas
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	flex:textproc/flex
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libpcap.so.1:net/libpcap \
 		libksba.so:security/libksba \
 		libgpgme.so:security/gpgme \
 		libssh.so:security/libssh \
 		libgnutls.so:security/gnutls \
 		libnetsnmp.so:net-mgmt/net-snmp \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenbone-feed-sync>0:security/py-greenbone-feed-sync@${PY_FLAVOR} \
 		redis-server:databases/redis \
 		snmpget:net-mgmt/net-snmp \
 		rsync:net/rsync \
 		nmap:security/nmap
 
 USES=		bison cmake gnome pkgconfig python ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}-scanner
 USE_GNOME=	glib20
 
 CMAKE_ARGS+=	-DINSTALL_OLD_SYNC_SCRIPT=OFF
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-error=invalid-utf8
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c
 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c
 	@${REINPLACE_CMD} -e 's|vendor_version_get ()|vendor_version_get (void)|g' ${WRKSRC}/misc/vendorversion.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
 .include <bsd.port.post.mk>
diff --git a/security/openvas/distinfo b/security/openvas/distinfo
index 61656f1b44f6..d93992e72b96 100644
--- a/security/openvas/distinfo
+++ b/security/openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695269107
-SHA256 (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 7ac193c18097742ba8b7360802a10c3b3a9a9c742dbe788eaa34e6fcad1405b4
-SIZE (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 976268
+TIMESTAMP = 1697841533
+SHA256 (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = dd69b79a0ca4f5d2a7186398530b9ef848599b1ad6fb90c506a74fbf02d84230
+SIZE (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = 1027968
diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist
index 748a3b72dc38..701b681b3478 100644
--- a/security/openvas/pkg-plist
+++ b/security/openvas/pkg-plist
@@ -1,21 +1,21 @@
 bin/openvas-nasl
 bin/openvas-nasl-lint
 @sample %%ETCDIR%%/openvas_log.conf.sample
 lib/libopenvas_misc.so
 lib/libopenvas_misc.so.22
-lib/libopenvas_misc.so.22.7.5
+lib/libopenvas_misc.so.22.7.6
 lib/libopenvas_nasl.so
 lib/libopenvas_nasl.so.22
-lib/libopenvas_nasl.so.22.7.5
+lib/libopenvas_nasl.so.22.7.6
 sbin/openvas
 share/man/man1/openvas-nasl-lint.1.gz
 share/man/man1/openvas-nasl.1.gz
 share/man/man8/openvas.8.gz
 @dir %%ETCDIR%%/gnupg
 @dir %%DATADIR%%
 @dir /var/lib
 @dir(gvm,gvm,750) /var/lib/openvas/gnupg
 @dir(gvm,gvm,750) /var/lib/openvas/plugins
 @dir(gvm,gvm,750) /var/lib/openvas
 @dir(gvm,gvm,750) /var/log/gvm
 @dir(gvm,gvm,750) /var/run/ospd
diff --git a/security/py-greenbone-feed-sync/Makefile b/security/py-greenbone-feed-sync/Makefile
index 0493918b8342..658205e089fe 100644
--- a/security/py-greenbone-feed-sync/Makefile
+++ b/security/py-greenbone-feed-sync/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	greenbone-feed-sync
 DISTVERSION=	23.8.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	new script for downloading the Greenbone Community Feed
 WWW=		https://github.com/greenbone/greenbone-feed-sync
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \
 		rsync:net/rsync
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	pep517
 
 NO_ARCH=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 post-extract:
 	${MV} ${WRKSRC}/tests ${WRKSRC}/greenbone/
 
 post-patch:
 	@${RM} ${WRKSRC}/greenbone/feed/sync/config.py.orig
 	@${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/greenbone/feed/sync/config.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gvm
 	@${MKDIR} ${STAGEDIR}/var/lib/gvm
 	@${MKDIR} ${STAGEDIR}/var/lib/openvas/plugins
 	@${MKDIR} ${STAGEDIR}/var/lib/notus
 
 .include <bsd.port.mk>
diff --git a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
index b7736118da6d..f22b751f5c55 100644
--- a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
+++ b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
@@ -1,15 +1,16 @@
---- greenbone/feed/sync/config.py	2023-09-21 01:01:53.391475000 -0500
-+++ greenbone/feed/sync/config.py	2023-09-21 01:02:58.557438000 -0500
+--- greenbone/feed/sync/config.py	2023-08-31 07:57:04.000000000 -0500
++++ greenbone/feed/sync/config.py	2023-10-20 10:18:44.157521000 -0500
 @@ -69,10 +69,10 @@
  DEFAULT_GVMD_LOCK_FILE_PATH = "gvm/feed-update.lock"
  DEFAULT_OPENVAS_LOCK_FILE_PATH = "openvas/feed-update.lock"
  
 -DEFAULT_CONFIG_FILE = "/etc/gvm/greenbone-feed-sync.toml"
+-DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml"
 +DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml"
- DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml"
++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml"
  
 -DEFAULT_ENTERPRISE_KEY_PATH = "/etc/gvm/greenbone-enterprise-feed-key"
 +DEFAULT_ENTERPRISE_KEY_PATH = "%%LOCALBASE%%/etc/gvm/greenbone-enterprise-feed-key"
  
  DEFAULT_GROUP = "gvm"
  DEFAULT_USER = "gvm"
diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile
index ac28d53f49d2..37022b698a85 100644
--- a/security/py-notus-scanner/Makefile
+++ b/security/py-notus-scanner/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	notus-scanner
 DISTVERSION=	22.6.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	scanner for creating results from local security checks
 WWW=		https://github.com/greenbone/notus-scanner
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry2setup>0:devel/py-poetry2setup@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		mosquitto:net/mosquitto
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 post-extract:
 	${MV} ${WRKSRC}/tests ${WRKSRC}/notus/
 
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/notus/scanner/cli/parser.py
 	${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \
 		${WRKSRC}/notus/scanner/loader/gpg_sha_verifier.py
 	${REINPLACE_CMD} '36d' ${WRKSRC}/pyproject.toml
 	@${RM} ${WRKSRC}/notus/scanner/cli/parser.py.orig
 	@${RM} ${WRKSRC}/notus/scanner/config.py.orig
 
 pre-configure:
 	@cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/notus-scanner
 	@${MKDIR} ${STAGEDIR}/var/lib/openvas/plugins/notus/products
 	@${MKDIR} ${STAGEDIR}/var/lib/notus
 
 .include <bsd.port.mk>
diff --git a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
index 5b9a28e1b67b..cc9c814cdd51 100644
--- a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
+++ b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
@@ -1,11 +1,14 @@
---- notus/scanner/cli/parser.py	2022-07-31 23:45:49.051030000 -0500
-+++ notus/scanner/cli/parser.py	2022-07-31 23:46:07.662584000 -0500
-@@ -29,7 +29,7 @@
+--- notus/scanner/cli/parser.py	2023-08-30 03:14:56.000000000 -0500
++++ notus/scanner/cli/parser.py	2023-10-20 18:26:27.530523000 -0500
+@@ -16,9 +16,8 @@
  
  logger = logging.getLogger(__name__)
  
 -DEFAULT_CONFIG_FILE = "/etc/gvm/notus-scanner.toml"
+-DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml"
+-
 +DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml"
- DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml"
- 
++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml"
  
+ def log_level(string: str) -> str:
+     """Check if provided string is a valid log level."""
diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile
index 514dfcc854fa..3d6dc7066687 100644
--- a/security/py-python-gvm/Makefile
+++ b/security/py-python-gvm/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	python-gvm
-DISTVERSION=	23.5.1
+DISTVERSION=	23.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The Greenbone Vulnerability Management Python API library
 WWW=		https://github.com/greenbone/python-gvm
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry2setup>0:devel/py-poetry2setup@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 post-extract:
 	${MV} ${WRKSRC}/tests ${WRKSRC}/gvm/
 
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|/run/gvmd/|/var/run/gvmd/|g' \
 		${WRKSRC}/gvm/connections.py
-	${REINPLACE_CMD} '31d' ${WRKSRC}/pyproject.toml
+	${REINPLACE_CMD} -e 's|, { include = "tests", format = "sdist" }||g' \
+		${WRKSRC}/pyproject.toml
 
 pre-configure:
 	@cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo
index 668f679af186..7723bb2b2fec 100644
--- a/security/py-python-gvm/distinfo
+++ b/security/py-python-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695319244
-SHA256 (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = c0933d1fd0a1c04ca88d6dcf74646ef2fed4aa5bb44132b1f60679cf580e99a7
-SIZE (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = 291456
+TIMESTAMP = 1697844480
+SHA256 (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 6d11c9b07790386bb16a8cce207a92ccfbaf9202b6dec2089bdd9b673ea6ef0c
+SIZE (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 272387