diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index e87c4077..75b369f1 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
-ENV ES_VER=8.17.5
+ENV ES_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/elk/elasticsearch/dist/elasticsearch.yml b/docker/elk/elasticsearch/dist/elasticsearch.yml
index 35d79569..a1e34c36 100644
--- a/docker/elk/elasticsearch/dist/elasticsearch.yml
+++ b/docker/elk/elasticsearch/dist/elasticsearch.yml
@@ -11,5 +11,5 @@ http.host: 0.0.0.0
 http.cors.enabled: true
 http.cors.allow-origin: "*"
 indices.query.bool.max_clause_count: 2000
-cluster.routing.allocation.disk.watermark.enable_for_single_data_node: true
+#cluster.routing.allocation.disk.watermark.enable_for_single_data_node: true
 discovery.type: single-node
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 9eb8330d..750f4c74 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:20.18.2-alpine3.20
-ENV KB_VER=8.17.5
+ENV KB_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 756e9f14..073539cc 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
-ENV LS_VER=8.17.5
+ENV LS_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/