diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 4f24b957..985d3761 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
 ENV ES_VER=8.14.2
 #
@@ -8,6 +8,7 @@ COPY dist/ /root/dist/
 # Install packages
 RUN	apt-get update -y && \
     apt-get install -y \
+			adduser \
             aria2 \
             curl && \
 #
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 95235a10..1d6d6f02 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -32,8 +32,8 @@ RUN apk --no-cache -U add \
     echo "xpack.reporting.roles.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
     echo "elasticsearch.requestTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
     echo "elasticsearch.shardTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
-    echo "kibana.autocompleteTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
-    echo "kibana.autocompleteTerminateAfter: 1000000" >> /usr/share/kibana/config/kibana.yml && \
+    echo "unifiedSearch.autocomplete.valueSuggestions.timeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
+    echo "unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 1000000" >> /usr/share/kibana/config/kibana.yml && \
     rm -rf /usr/share/kibana/optimize/bundles/* && \
     /usr/share/kibana/bin/kibana --optimize --allow-root && \
     addgroup -g 2000 kibana && \
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 0aa92483..2c611e7a 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LS_VER=8.14.2
 #
@@ -8,6 +8,7 @@ COPY dist/ /root/dist/
 # Install packages
 RUN apt-get update -y && \
     apt-get install -y \
+    		 adduser \
              aria2 \
              bash \
              bzip2 \
diff --git a/docker/elk/map/Dockerfile b/docker/elk/map/Dockerfile
index 89a4246a..ac279fd5 100644
--- a/docker/elk/map/Dockerfile
+++ b/docker/elk/map/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 #
 # Install packages
 RUN apk --no-cache -U add \
diff --git a/docker/endlessh/Dockerfile b/docker/endlessh/Dockerfile
index 89f43882..1ce956e6 100644
--- a/docker/endlessh/Dockerfile
+++ b/docker/endlessh/Dockerfile
@@ -16,27 +16,11 @@ RUN apk -U add --no-cache \
     make && \
     mv /opt/endlessh/endlessh /root/dist
 #
-FROM alpine:3.19
+FROM alpine:3.20
 #
 COPY --from=builder /root/dist/* /opt/endlessh/
 #
-# Install packages
-RUN apk -U add --no-cache \
-		libcap && \
-#
-# Setup user, groups and configs
-    mkdir -p /var/log/endlessh && \
-    addgroup -g 2000 endlessh && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 endlessh && \
-    chown -R endlessh:endlessh /opt/endlessh && \
-    #setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
-#
-# Clean up
-    rm -rf /root/* \
-           /var/cache/apk/*
-#
-# Set workdir and start endlessh
 STOPSIGNAL SIGINT
-USER endlessh:endlessh
+USER 2000:2000
 WORKDIR /opt/endlessh/
 CMD ./endlessh -f endlessh.conf >/var/log/endlessh/endlessh.log