diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile
index 33dfdaa..cdfc313 100644
--- a/sysutils/data-prepper/Makefile
+++ b/sysutils/data-prepper/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=   https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	opensearch-${PKGNAME}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	opensearch@FreeBSD.org
-COMMENT=	Data Prepper
+COMMENT=	A server-side data collector for OpenSearch
 WWW=		https://opensearch.org
 
 LICENSE=	APACHE20
@@ -15,12 +15,13 @@ RUN_DEPENDS=	bash>0:shells/bash
 
 USES=		cpe shebangfix java
 # This ports works only with Java 17
-JAVA_VERSION=	17
+JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/data-prepper
 
-DATADIR=	${PREFIX}/lib/${PORTNAME}
+# Test
+#DATADIR=	${PREFIX}/lib/${PORTNAME}
 NO_BUILD=	yes
 
 BINS=		data-prepper
@@ -32,7 +33,6 @@ USERS=		${SEARCHUSER}
 GROUPS=		${SEARCHGROUP}
 
 do-install:
-	${ECHO_CMD} ${ETCDIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for f in ${CONFIG_FILES}
 	${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
@@ -45,6 +45,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	${MKDIR} ${STAGEDIR}${DATADIR}/pipelines
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "examples lib pipelines" ${STAGEDIR}${DATADIR}/)
-	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/config
+	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/config
 
 .include <bsd.port.mk>
diff --git a/sysutils/data-prepper/files/data-prepper.in b/sysutils/data-prepper/files/data-prepper.in
index 3b4b34b..701c5c4 100644
--- a/sysutils/data-prepper/files/data-prepper.in
+++ b/sysutils/data-prepper/files/data-prepper.in
@@ -26,11 +26,11 @@ rcvar=data_prepper_enable
 load_rc_config ${name}
 
 : ${data_prepper_enable:=NO}
-: ${data_prepper_user:=opensearch}
-: ${data_prepper_group:=opensearch}
+: ${data_prepper_user:=%%SEARCHUSER%%}
+: ${data_prepper_group:=%%SEARCHGROUP%%}
 : ${data_prepper_config:=%%PREFIX%%/etc/data-prepper/data-prepper-config.yaml}
 : ${data_prepper_config_dir:=%%PREFIX%%/etc/data-prepper}
-: ${data_prepper_java_home:="%%LOCALBASE%%/openjdk17"}
+: ${data_prepper_java_home:="%%JAVA_HOME%%"}
 : ${data_prepper_home:="%%LOCALBASE%%/lib/data-prepper"}
 
 export JAVA_HOME=${data_prepper_java_home}
@@ -39,7 +39,7 @@ pidfile=/var/run/${name}/${name}.pid
 procname=${data_prepper_home}/bin/data-prepper
 command="/usr/sbin/daemon"
 
-command_args="-P ${pidfile} -r -f ${procname}" 
+command_args="-P ${pidfile} -r -f ${procname}"
 
 start_precmd="data_prepper_precmd"
 
diff --git a/sysutils/data-prepper/files/pkg-messsage.in b/sysutils/data-prepper/files/pkg-messsage.in
new file mode 100644
index 0000000..78e4d40
--- /dev/null
+++ b/sysutils/data-prepper/files/pkg-messsage.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+!!! This port is under development. Please consider it experimental. !!!
+
+Data Prepper needs pipelines to be configured in
+%%LOCALBASE%%/lib/data-prepper/pipelines
+
+Examples can be found in %%LOCALBASE%%/lib/data-prepper/examples
+EOM
+}
+]
diff --git a/sysutils/data-prepper/pkg-messsage b/sysutils/data-prepper/pkg-messsage
deleted file mode 100644
index 97d0111..0000000
--- a/sysutils/data-prepper/pkg-messsage
+++ /dev/null
@@ -1,6 +0,0 @@
-!!! This port is under development. Please consider it experimental. !!!
-
-Data Prepper needs pipelines to be configured in
-/usr/local/lib/data-prepper/pipelines
-
-Examples can be found in /usr/local/lib/data-prepper/examples