diff --git a/net/akhq/Makefile b/net/akhq/Makefile
index 1a8cb7ad331b..d1f433e0d0da 100644
--- a/net/akhq/Makefile
+++ b/net/akhq/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	akhq
 DISTVERSION=	0.25.1
 DISTVERSIONSUFFIX= -all
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/
 EXTRACT_SUFX=	.jar
 
 MAINTAINER=	freebsd@hackacad.net
-COMMENT=	AKHQ (previously known as KafkaHQ)
+COMMENT=	Kafka Gui for Apache Kafka
 WWW=		https://github.com/tchiotludo/akhq
 
 LICENSE=	APACHE20
 
 USES=		java
 JAVA_VERSION=	17+
 USE_RC_SUBR=	akhq
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	akhq
+SUB_LIST=	WWWOWN=${WWWOWN}
 
-PLIST_FILES=	${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar
+PLIST_FILES=	"@sample ${ETCDIR}/application.yml.sample" \
+		${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar 
+PLIST_SUB+=     ${SUB_LIST}
 
 CONFIG_FILES=	application.yml
 
 NO_EXTRACT=	yes
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/akhq
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar
-	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample
-	${ECHO} "@sample ${PREFIX}/etc/akhq/application.yml.sample" >> ${TMPPLIST}
-
-post-install:
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ; \
-	fi
+	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml.sample
+	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml
 
 .include <bsd.port.mk>
diff --git a/net/akhq/files/akhq.in b/net/akhq/files/akhq.in
index d6556c5f5e67..d13c742faf56 100644
--- a/net/akhq/files/akhq.in
+++ b/net/akhq/files/akhq.in
@@ -1,40 +1,40 @@
 #!/bin/sh
 
 # PROVIDE: akhq
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name=akhq
 rcvar=akhq_enable
 
 load_rc_config $name
 
 : ${akhq_enable:=NO}
 : ${akhq_config:=%%LOCALBASE%%/etc/akhq/application.yml}
 : ${akhq_jar:=%%LOCALBASE%%/share/java/akhq/akhq.jar}
 : ${akhq_java:=%%LOCALBASE%%/bin/java}
-: ${akhq_user:=www}
+: ${akhq_user:=%%WWWOWN%%}
 : ${akhq_pidfile:=/var/run/${name}.pid}
 
 command="/usr/sbin/daemon"
 command_args="-P ${akhq_pidfile} -r -f ${akhq_java} -Dmicronaut.config.files=${akhq_config} -jar ${akhq_jar}"
 
 start_precmd=akhq_startprecmd
 
 akhq_startprecmd()
 {
     # Ensure the directory for the PID file exists
     if [ ! -d $(dirname ${akhq_pidfile}) ]; then
         install -d -o ${akhq_user} -m 0750 $(dirname ${akhq_pidfile})
     fi
 
     # Ensure the PID file exists with the right permissions
     if [ ! -e "${akhq_pidfile}" ]; then
         install -m 0600 -o ${akhq_user} /dev/null ${akhq_pidfile}
     fi
 }
 
 run_rc_command "$1"
 
diff --git a/net/akhq/files/application.yml b/net/akhq/files/application.yml
index d80404d95c04..be61195685ce 100644
--- a/net/akhq/files/application.yml
+++ b/net/akhq/files/application.yml
@@ -1,9 +1,9 @@
 akhq:
   connections:
     local:
       properties:
         bootstrap.servers: "localhost:9092"
 micronaut:
   server:
     port: 8080
-    host: "0.0.0.0"
+    host: "127.0.0.1"