diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile
index 9901030..8acacfb 100644
--- a/sysutils/data-prepper/Makefile
+++ b/sysutils/data-prepper/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	data-prepper
 DISTVERSION=	2.10.2
 DISTVERSIONSUFFIX=	-linux-x64
-PORTREVISION=	3
 CATEGORIES=	sysutils java
 MASTER_SITES=   https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	opensearch-${PORTNAME}-jdk-${DISTVERSIONFULL}
@@ -21,14 +20,16 @@ USE_RC_SUBR=	${PORTNAME}
 SHEBANG_FILES=	bin/data-prepper
 
 NO_BUILD=	yes
+SUB_FILES=	data-preper
+SUB_LIST=	SEARCHUSER=${SEARCHUSER} SEARCHGROUP=${SEARCHGROUP}
 
 BINS=		data-prepper
 CONFIG_FILES=	data-prepper-config.yaml log4j2-rolling.properties
 
 SEARCHUSER?=	opensearch
 SEARCHGROUP?=	${SEARCHUSER}
-USERS=		${SEARCHUSER}
-GROUPS=		${SEARCHGROUP}
+#USERS=		${SEARCHUSER}
+#GROUPS=		${SEARCHGROUP}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
@@ -39,7 +40,6 @@ do-install:
 .for f in ${BINS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin
 .endfor
-	#${MKDIR} ${STAGEDIR}${DATADIR}/examples
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
 	${MKDIR} ${STAGEDIR}${DATADIR}/lib