diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
index 1f9a2a6349dc..3d8af6a77d1a 100644
--- a/net-im/jitsi-videobridge/Makefile
+++ b/net-im/jitsi-videobridge/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	jitsi
 DISTVERSION=	2.3-272
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im java
 PKGNAMESUFFIX=	-videobridge
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	WebRTC compatible video router or SFU
 WWW=		https://jitsi.org/jitsi-videobridge
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	maven>0:devel/maven
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		java
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	0360d04
 JAVA_VERSION=	17
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES+=	pkg-message
 SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/videobridge
 
 USERS=		jvb ${PORTNAME}
 GROUPS=		${USERS}
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven
 DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-PbuildFatJar -DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} JAVA_VERSION=${JAVA_VERSION} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${WRKSRC}/jvb/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/sip-communicator.properties.sample \
 		${STAGEDIR}${ETCDIR}/sip-communicator.properties.sample
 	${INSTALL_DATA} ${WRKSRC}/jvb/target/${PORTNAME}${PKGNAMESUFFIX}-2.3-SNAPSHOT-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
 
 .include <bsd.port.mk>
diff --git a/net-im/jitsi-videobridge/files/jitsi-videobridge.in b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
index 8c2d7ce777e4..59af79c74659 100644
--- a/net-im/jitsi-videobridge/files/jitsi-videobridge.in
+++ b/net-im/jitsi-videobridge/files/jitsi-videobridge.in
@@ -1,87 +1,87 @@
 #!/bin/sh
 
 # PROVIDE: jitsi-videobridge
 # REQUIRE: NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Configuration settings for jitsi-videobridge in /etc/rc.conf:
 #
 # jitsi_videobridge_enable:	run jitsi_videobridge server (default=NO)
 # jitsi_videobridge_maxmem:	maximum memory used (default=3072m)
 # jitsi_videobridge_flags:	additional flags for jitsi_videobridge server (default="")
 #
 
 . /etc/rc.subr
 
 name="jitsi_videobridge"
 rcvar=${name}_enable
 
 jitsi_videobridge_config="%%ETCDIR%%/jitsi-videobridge.conf"
 jitsi_videobridge_jar="%%JAVAJARDIR%%/jitsi-videobridge.jar"
 jitsi_videobridge_logging_config="%%DATADIR%%/lib/logging.properties"
 jitsi_videobridge_user="jvb"
 
 load_rc_config "${name}"
 
 : ${jitsi_videobridge_enable="NO"}
 : ${jitsi_videobridge_maxmem="3072m"}
 : ${jitsi_videobridge_flags=""}
 
 command="%%JAVA%%"
 
 pidfile="/var/run/jitsi-videobridge.pid"
 required_files="${jitsi_videobridge_config}"
 start_cmd=${name}_start
 stop_cmd=${name}_stop
 status_cmd=${name}_status
 restart_cmd=${name}_restart
 
 jitsi_videobridge_start()
 {
 	daemon -u ${jitsi_videobridge_user} -p ${pidfile} -o /var/log/jitsi-videobridge.log \
 		${command} -Xmx${jitsi_videobridge_maxmem} \
-		-XX:+UseConcMarkSweepGC \
+		-XX:+UseG1GC \
 		-XX:+HeapDumpOnOutOfMemoryError \
 		-XX:HeapDumpPath=/tmp \
 		-Djava.util.logging.config.file=${jitsi_videobridge_logging_config} \
 		-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
 		-Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
 		-Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
 		-Dconfig.file=${jitsi_videobridge_config} \
 		-cp ${jitsi_videobridge_jar} \
 		org.jitsi.videobridge.MainKt \
 		${jitsi_videobridge_flags}
 
 		echo "Starting ${name}"
 }
 
 jitsi_videobridge_stop()
 {
 	if [ -f ${pidfile} ]
 	then
 		kill `cat ${pidfile}`
 		rm ${pidfile}
 		echo "Stopping ${name}"
 	fi
 }
 
 jitsi_videobridge_status()
 {
 	# If running, show pid
 	if [ -f ${pidfile} ]
 	then
 		echo "${name} is running as pid" `cat ${pidfile}`
 	else
 		echo "${name} is not running"
 	fi
 }
 
 jitsi_videobridge_restart()
 {
 	echo "Performing restart ${name}"
 	jitsi_videobridge_stop
 	sleep 5
 	jitsi_videobridge_start
 }
 
 run_rc_command "$1"