diff --git a/.env b/.env
index 515df09..66dc51b 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ELASTIC_VERSION=8.18.3
+ELASTIC_VERSION=8.18.4
 
 ## Passwords for stack users
 #
diff --git a/README.md b/README.md
index 162d2ec..4d25b6e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Elastic stack (ELK) on Docker
 
-[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-8.18.3-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
+[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-8.18.4-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
 [![Build Status](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml/badge.svg?branch=release-8.x)](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml?query=branch%3Arelease-8.x)
 [![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://app.gitter.im/#/room/#deviantony_docker-elk:gitter.im)
 
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index c829539..bb81cbf 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,7 +1,7 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.18.4}
 
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu
diff --git a/extensions/enterprise-search/Dockerfile b/extensions/enterprise-search/Dockerfile
index cb71641..37a50a9 100644
--- a/extensions/enterprise-search/Dockerfile
+++ b/extensions/enterprise-search/Dockerfile
@@ -1,4 +1,4 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/enterprise-search/enterprise-search:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/enterprise-search/enterprise-search:${ELASTIC_VERSION:-8.18.4}
diff --git a/extensions/filebeat/Dockerfile b/extensions/filebeat/Dockerfile
index 05e5627..e29c964 100644
--- a/extensions/filebeat/Dockerfile
+++ b/extensions/filebeat/Dockerfile
@@ -1,3 +1,3 @@
 ARG ELASTIC_VERSION
 
-FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-8.18.4}
diff --git a/extensions/fleet/Dockerfile b/extensions/fleet/Dockerfile
index ddea4af..0c85fda 100644
--- a/extensions/fleet/Dockerfile
+++ b/extensions/fleet/Dockerfile
@@ -1,6 +1,6 @@
 ARG ELASTIC_VERSION
 
-FROM docker.elastic.co/elastic-agent/elastic-agent:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/elastic-agent/elastic-agent:${ELASTIC_VERSION:-8.18.4}
 
 # Ensure the 'state' directory exists and is owned by the 'elastic-agent' user,
 # otherwise mounting a named volume in that location creates a directory owned
diff --git a/extensions/heartbeat/Dockerfile b/extensions/heartbeat/Dockerfile
index 0b12d6a..a3cbc71 100644
--- a/extensions/heartbeat/Dockerfile
+++ b/extensions/heartbeat/Dockerfile
@@ -1,3 +1,3 @@
 ARG ELASTIC_VERSION
 
-FROM docker.elastic.co/beats/heartbeat:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/beats/heartbeat:${ELASTIC_VERSION:-8.18.4}
diff --git a/extensions/metricbeat/Dockerfile b/extensions/metricbeat/Dockerfile
index e553cfa..fb46634 100644
--- a/extensions/metricbeat/Dockerfile
+++ b/extensions/metricbeat/Dockerfile
@@ -1,3 +1,3 @@
 ARG ELASTIC_VERSION
 
-FROM docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION:-8.18.4}
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index aa29ace..cf52fdf 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,7 +1,7 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-8.18.4}
 
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index f8e34a9..747d83d 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,7 +1,7 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.18.4}
 
 # Add your logstash plugins setup here
 # Example: RUN logstash-plugin install logstash-filter-json
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 811e226..c07b9d5 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -1,6 +1,6 @@
 ARG ELASTIC_VERSION
 
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.18.3}
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.18.4}
 
 ENTRYPOINT ["/entrypoint.sh"]