diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 4f01820..4f493fe 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -42,7 +42,7 @@ RUN set -eux ; \
 RUN mkdir /usr/share/elasticsearch
 WORKDIR /usr/share/elasticsearch
 
-RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.24-linux-$(arch).tar.gz
+RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.25-linux-$(arch).tar.gz
 
 RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1
 
@@ -134,25 +134,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk
 
 EXPOSE 9200 9300
 
-LABEL org.label-schema.build-date="2024-09-05T07:34:51.812485320Z" \
+LABEL org.label-schema.build-date="2024-10-16T22:06:36.904732810Z" \
   org.label-schema.license="Elastic-License-2.0" \
   org.label-schema.name="Elasticsearch" \
   org.label-schema.schema-version="1.0" \
   org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
   org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
-  org.label-schema.vcs-ref="fcf25fff740db6ab3ed5d145c58d70e4c3528ea7" \
+  org.label-schema.vcs-ref="f9b6b57d1d0f76e2d14291c04fb50abeb642cfbf" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.24" \
-  org.opencontainers.image.created="2024-09-05T07:34:51.812485320Z" \
+  org.label-schema.version="7.17.25" \
+  org.opencontainers.image.created="2024-10-16T22:06:36.904732810Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
   org.opencontainers.image.licenses="Elastic-License-2.0" \
-  org.opencontainers.image.revision="fcf25fff740db6ab3ed5d145c58d70e4c3528ea7" \
+  org.opencontainers.image.revision="f9b6b57d1d0f76e2d14291c04fb50abeb642cfbf" \
   org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
   org.opencontainers.image.title="Elasticsearch" \
   org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
   org.opencontainers.image.vendor="Elastic" \
-  org.opencontainers.image.version="7.17.24"
+  org.opencontainers.image.version="7.17.25"
 
 # Our actual entrypoint is `tini`, a minimal but functional init program. It
 # calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 2a5a309..c9aea95 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
 RUN cd /tmp && \
   curl --retry 8 -s -L \
     --output kibana.tar.gz \
-     https://artifacts.elastic.co/downloads/kibana/kibana-7.17.24-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-7.17.25-linux-$(arch).tar.gz && \
   cd -
 
 
@@ -104,25 +104,25 @@ RUN groupadd --gid 1000 kibana && \
       --home-dir /usr/share/kibana --no-create-home \
       kibana
 
-LABEL org.label-schema.build-date="2024-09-04T11:10:43.736Z" \
+LABEL org.label-schema.build-date="2024-10-16T11:09:06.408Z" \
   org.label-schema.license="Elastic License" \
   org.label-schema.name="Kibana" \
   org.label-schema.schema-version="1.0" \
   org.label-schema.url="https://www.elastic.co/products/kibana" \
   org.label-schema.usage="https://www.elastic.co/guide/en/kibana/reference/index.html" \
-  org.label-schema.vcs-ref="4fb3ec3c959e4c569aca4674243a2ecba9d973a7" \
+  org.label-schema.vcs-ref="427e9521131a6f5f96fe79fb6d6eca013a5f89f3" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.24" \
-  org.opencontainers.image.created="2024-09-04T11:10:43.736Z" \
+  org.label-schema.version="7.17.25" \
+  org.opencontainers.image.created="2024-10-16T11:09:06.408Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="4fb3ec3c959e4c569aca4674243a2ecba9d973a7" \
+  org.opencontainers.image.revision="427e9521131a6f5f96fe79fb6d6eca013a5f89f3" \
   org.opencontainers.image.source="https://github.com/elastic/kibana" \
   org.opencontainers.image.title="Kibana" \
   org.opencontainers.image.url="https://www.elastic.co/products/kibana" \
   org.opencontainers.image.vendor="Elastic" \
-  org.opencontainers.image.version="7.17.24"
+  org.opencontainers.image.version="7.17.25"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index a87d87c..62ad56e 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -26,9 +26,9 @@ RUN groupadd --gid 1000 logstash && \
 
 # Add Logstash itself.
 RUN \
- curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.24-linux-$(arch).tar.gz | \
+ curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.25-linux-$(arch).tar.gz | \
     tar zxf - -C /usr/share && \
-    mv /usr/share/logstash-7.17.24 /usr/share/logstash && \
+    mv /usr/share/logstash-7.17.25 /usr/share/logstash && \
     chown --recursive logstash:logstash /usr/share/logstash/ && \
     chown -R logstash:root /usr/share/logstash && \
     chmod -R g=u /usr/share/logstash && \
@@ -67,15 +67,15 @@ LABEL  org.label-schema.schema-version="1.0" \
   org.opencontainers.image.vendor="Elastic" \
   org.label-schema.name="logstash" \
   org.opencontainers.image.title="logstash" \
-  org.label-schema.version="7.17.24" \
-  org.opencontainers.image.version="7.17.24" \
+  org.label-schema.version="7.17.25" \
+  org.opencontainers.image.version="7.17.25" \
   org.label-schema.url="https://www.elastic.co/products/logstash" \
   org.label-schema.vcs-url="https://github.com/elastic/logstash" \
   org.label-schema.license="Elastic License" \
   org.opencontainers.image.licenses="Elastic License" \
   org.opencontainers.image.description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
-  org.label-schema.build-date=2024-09-03T23:04:52+00:00 \
-  org.opencontainers.image.created=2024-09-03T23:04:52+00:00
+  org.label-schema.build-date=2024-10-16T08:48:26+00:00 \
+  org.opencontainers.image.created=2024-10-16T08:48:26+00:00
 
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash/env2yaml/env2yaml b/logstash/env2yaml/env2yaml
index 369b733..91bda12 100755
Binary files a/logstash/env2yaml/env2yaml and b/logstash/env2yaml/env2yaml differ