diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile
index 6baadad..58e16eb 100644
--- a/devel/etcd35/Makefile
+++ b/devel/etcd35/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	etcd
-PORTVERSION=	3.5.15
+PORTVERSION=	3.5.18
 DISTVERSIONPREFIX=	v
 #PORTREVISION=	25
 CATEGORIES=	devel
diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo
index 0fb8f31..c6f3e06 100644
--- a/devel/etcd35/distinfo
+++ b/devel/etcd35/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1729604976
-SHA256 (coreos-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84
-SIZE (coreos-etcd-v3.5.15_GH0.tar.gz) = 4113649
+TIMESTAMP = 1738341575
+SHA256 (coreos-etcd-v3.5.18_GH0.tar.gz) = 8c8890b15c1a19263ab4ee2b374698c1d76c2b31e9b55bdeea47193aa48d8025
+SIZE (coreos-etcd-v3.5.18_GH0.tar.gz) = 4128059
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (bgentry-speakeasy-v0.1.0_GH0.tar.gz) = 863f57f96f77c2b4e5488e34e8df47478e9ffa9920779ca4df2cc3adc0d03252
diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile
index e7deb34..dc10d5d 100644
--- a/sysutils/data-prepper/Makefile
+++ b/sysutils/data-prepper/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	data-prepper
 DISTVERSION=	2.10.2
 DISTVERSIONSUFFIX=	-linux-x64
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=   https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	opensearch-${PKGNAME}${DISTVERSIONSUFFIX}
@@ -14,7 +15,8 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	bash>0:shells/bash
 
 USES=		cpe shebangfix java
-JAVA_VERSION=	17+
+# This ports works only with Java 17
+JAVA_VERSION=	17
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/data-prepper
diff --git a/sysutils/data-prepper/files/data-prepper.in b/sysutils/data-prepper/files/data-prepper.in
index a8f0d4e..3b4b34b 100644
--- a/sysutils/data-prepper/files/data-prepper.in
+++ b/sysutils/data-prepper/files/data-prepper.in
@@ -30,14 +30,13 @@ load_rc_config ${name}
 : ${data_prepper_group:=opensearch}
 : ${data_prepper_config:=%%PREFIX%%/etc/data-prepper/data-prepper-config.yaml}
 : ${data_prepper_config_dir:=%%PREFIX%%/etc/data-prepper}
-: ${data_prepper_java_home:="/usr/local/openjdk17"}
-: ${data_prepper_home:="/usr/local/lib/data-prepper"}
+: ${data_prepper_java_home:="%%LOCALBASE%%/openjdk17"}
+: ${data_prepper_home:="%%LOCALBASE%%/lib/data-prepper"}
 
 export JAVA_HOME=${data_prepper_java_home}
 required_files="${data_prepper_config}"
 pidfile=/var/run/${name}/${name}.pid
 procname=${data_prepper_home}/bin/data-prepper
-#procname=${data_prepper_java_home}/bin/java
 command="/usr/sbin/daemon"
 
 command_args="-P ${pidfile} -r -f ${procname}"