diff --git a/security/gsa/Makefile b/security/gsa/Makefile
index c70c532ad595..e0dfa1405e9e 100644
--- a/security/gsa/Makefile
+++ b/security/gsa/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gsa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	22.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
@@ -10,7 +10,7 @@ WWW=		https://github.com/greenbone/gsa
 
 LICENSE=	AGPLv3+
 
-BUILD_DEPENDS=	yarn:www/yarn
+BUILD_DEPENDS=	npm-node18>0:www/npm-node18
 RUN_DEPENDS=	${LOCALBASE}/sbin/gsad:security/gsad
 
 USES=		nodejs:build
@@ -19,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	gsa
 
-YARN_BIN=	${LOCALBASE}/bin/yarn
+NPM_BIN=	${LOCALBASE}/bin/npm
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
@@ -29,27 +29,25 @@ YARN_BIN=	${LOCALBASE}/bin/yarn
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
-DEPS_CACHE_DIR=		${WRKDIR}
+DEPS_CACHE_DIR=		${WRKSRC}
 
 .if (${DEV_UPDATE_MODE} == "yes")
+NPM_ARGS=	install
 post-build:
-	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
+	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} node_modules
 	@${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}"
 .else
-MASTER_SITES+=	LOCAL/acm/gsa/:yarn_cache
-DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
-YARN_ARGS=	--offline
+MASTER_SITES+=	LOCAL/acm/gsa/:npm_cache
+DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache
+NPM_ARGS=	run build
 .endif
 
-post-patch:
-	${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \
-		${WRKSRC}/.yarnrc
+post-extract:
+	@${MV} ${WRKDIR}/node_modules ${WRKSRC}
 
 do-build:
 	@cd ${WRKSRC} && \
-		${YARN_BIN} ${YARN_ARGS}
-	@cd ${WRKSRC} && \
-		${YARN_BIN} ${YARN_ARGS} build
+		${NPM_BIN} ${NPM_ARGS}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gvm/gsad/web
diff --git a/security/gsa/distinfo b/security/gsa/distinfo
index 348588172587..96842f914306 100644
--- a/security/gsa/distinfo
+++ b/security/gsa/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1696526628
-SHA256 (gsa-cache-22.7.1.tar.gz) = 56c1a1c900c2b45d711a1f31588fb98a90979b0866c68ec391795d0e9a2bc6fc
-SIZE (gsa-cache-22.7.1.tar.gz) = 48729903
+TIMESTAMP = 1697784180
+SHA256 (gsa-cache-22.7.1.tar.gz) = cdb0a815e3069eb24f43012ad16a51a9d171a35b04ddae7da769f09651f6d4ed
+SIZE (gsa-cache-22.7.1.tar.gz) = 67963784
 SHA256 (greenbone-gsa-v22.7.1_GH0.tar.gz) = 89c159db61df19fe21713fa02c0454e730653673e7ef9b4dc30485666a631a05
 SIZE (greenbone-gsa-v22.7.1_GH0.tar.gz) = 3607415