diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65d2b1c6..69ffe458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.8.0_6.5.4
+
+### Changed
+
+- Upgrade version 3.8.0_6.5.4. ([#97](https://github.com/wazuh/wazuh-docker/pull/97))
+
+### Removed
+
+- Remove cluster.py work around. ([#99](https://github.com/wazuh/wazuh-docker/pull/99))
+
 ## Wazuh Docker v3.7.2_6.5.4
 
+### Added
+
+- Add Kibana environmental variables for Wazuh APP config.yml. ([#89](https://github.com/wazuh/wazuh-docker/pull/89))
+
 ### 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))
+- Add env credentials for nginx. ([#86](https://github.com/wazuh/wazuh-docker/pull/86))
+- Improve filebeat configuration ([#88](https://github.com/wazuh/wazuh-docker/pull/88))
 
 ### Fixed 
 
-- Temporary fix for Wazuh cluster master node in Kubernetes ([#84](https://github.com/wazuh/wazuh-docker/pull/84))
+- 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
 
diff --git a/README.md b/README.md
index 99376538..d1ea97b6 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,6 @@ In addition, a docker-compose file is provided to launch the containers mentione
 * [Wazuh documentation for Docker](https://documentation.wazuh.com/current/docker/index.html)
 * [Docker hub](https://hub.docker.com/u/wazuh)
 
-## Current release
-
-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
 
 	wazuh-docker
diff --git a/VERSION b/VERSION
index c848da98..d9f8c63e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.7.2_6.5.4"
-REVISION="3731"
+WAZUH-DOCKER_VERSION="3.8.0_6.5.4"
+REVISION="3800"
diff --git a/docker-compose.yml b/docker-compose.yml
index 083d698a..77d34ca3 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.4
+    image: wazuh/wazuh:3.8.0_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.4
+    image: wazuh/wazuh-logstash:3.8.0_6.5.4
     hostname: logstash
     restart: always
 #    volumes:
@@ -61,7 +61,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.7.2_6.5.4
+    image: wazuh/wazuh-kibana:3.8.0_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.4
+    image: wazuh/wazuh-nginx:3.8.0_6.5.4
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 980d8e15..256dd679 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,11 +1,11 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM docker.elastic.co/kibana/kibana:6.5.4
-ARG WAZUH_APP_VERSION=3.7.2_6.5.4
+ARG WAZUH_APP_VERSION=3.8.0_6.5.4
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/3.7/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
+ADD https://raw.githubusercontent.com/wazuh/wazuh/3.8/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
 RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
     chown -R kibana:kibana /usr/share/kibana &&\
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 10ffcfc3..83bfa2ab 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.5.4
-ARG WAZUH_VERSION=3.7.2-1
+ARG WAZUH_VERSION=3.8.0-1
 
 
 # Updating image
@@ -77,8 +77,5 @@ 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/entrypoint.sh b/wazuh/config/entrypoint.sh
index 760fd158..9ee42aec 100644
--- a/wazuh/config/entrypoint.sh
+++ b/wazuh/config/entrypoint.sh
@@ -107,9 +107,6 @@ else
   print "No Wazuh configuration files to mount..."
 fi
 
-# Enabling ossec-authd.
-exec_cmd "/var/ossec/bin/ossec-control enable auth"
-
 function ossec_shutdown(){
   ${WAZUH_INSTALL_PATH}/bin/ossec-control stop;
 }