diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91f026ee..65d2b1c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.7.2_6.5.4
+
+### Changed
+
+- Update Elastic Stack version to 6.5.4. ([#82](https://github.com/wazuh/wazuh-docker/pull/82))
+- Add env credentials for nginx ([#86](https://github.com/wazuh/wazuh-docker/pull/86))
+
+### Fixed 
+
+- Temporary fix for Wazuh cluster master node in Kubernetes ([#84](https://github.com/wazuh/wazuh-docker/pull/84))
+
 ## Wazuh Docker v3.7.2_6.5.3
 
 ### Changed
diff --git a/README.md b/README.md
index e1fbc57d..56c09c2f 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 ## Current release
 
-Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
+Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.4. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
 
 ## Directory structure
 
diff --git a/VERSION b/VERSION
index f0bea7ad..c848da98 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.7.2_6.5.3"
-REVISION="3728"
+WAZUH-DOCKER_VERSION="3.7.2_6.5.4"
+REVISION="3731"
diff --git a/docker-compose.yml b/docker-compose.yml
index c3409ddd..083d698a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.7.2_6.5.3
+    image: wazuh/wazuh:3.7.2_6.5.4
     hostname: wazuh-manager
     restart: always
     ports:
@@ -23,7 +23,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.7.2_6.5.3
+    image: wazuh/wazuh-logstash:3.7.2_6.5.4
     hostname: logstash
     restart: always
 #    volumes:
@@ -39,7 +39,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4
     hostname: elasticsearch
     restart: always
     ports:
@@ -61,7 +61,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.7.2_6.5.3
+    image: wazuh/wazuh-kibana:3.7.2_6.5.4
     hostname: kibana
     restart: always
 #    ports:
@@ -76,7 +76,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.7.2_6.5.3
+    image: wazuh/wazuh-nginx:3.7.2_6.5.4
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index c1435ee7..b13e9f34 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.5.3
-ARG WAZUH_APP_VERSION=3.7.2_6.5.3
+FROM docker.elastic.co/kibana/kibana:6.5.4
+ARG WAZUH_APP_VERSION=3.7.2_6.5.4
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 641214a5..853bcca6 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.5.3
+FROM docker.elastic.co/logstash/logstash:6.5.4
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 29d4062f..0fb940e1 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -13,4 +13,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 VOLUME ["/etc/nginx/conf.d"]
 
+ENV NGINX_NAME="foo" \
+    NGINX_PWD="bar"
+
 ENTRYPOINT /entrypoint.sh
diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh
index 97dbf90c..2332222b 100644
--- a/nginx/config/entrypoint.sh
+++ b/nginx/config/entrypoint.sh
@@ -15,7 +15,7 @@ fi
 # Configuring default credentiales.
 if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then
   echo "Setting Nginx credentials"
-  echo bar|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd foo >/dev/null
+  echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null
 else
   echo "Kibana credentials already configured"
 fi
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 87fb09c3..10ffcfc3 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.5.3
+ARG FILEBEAT_VERSION=6.5.4
 ARG WAZUH_VERSION=3.7.2-1
 
 
@@ -77,6 +77,8 @@ RUN mkdir /etc/service/filebeat
 COPY config/filebeat.runit.service /etc/service/filebeat/run
 RUN chmod +x /etc/service/filebeat/run
 
+# Temporary fix for Wazuh cluster master node in Kubernetes
+RUN sed -i '87d;88d' /var/ossec/framework/wazuh/cluster/cluster.py
 
 # Run all services
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml
index 0f2ea6ce..fcb32e1e 100644
--- a/wazuh/config/filebeat.yml
+++ b/wazuh/config/filebeat.yml
@@ -1,11 +1,10 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 filebeat:
- inputs:
+ prospectors:
   - type: log
     paths:
-     - "/var/ossec/data/logs/alerts/alerts.json"
-    fields:
-      document_type: wazuh-alerts
+     - "/var/ossec/logs/alerts/alerts.json"
+    document_type: json
     json.message_key: log
     json.keys_under_root: true
     json.overwrite_keys: true