diff --git a/CHANGELOG.md b/CHANGELOG.md
index 003c533b..c5972578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.9.1_7.1.0
+
+### Added
+
+- Support for Elastic v7.1.0
+- New environment variables for Kibana ([@manuasir](https://github.com/manuasir)) [#22ad43](https://github.com/wazuh/wazuh-docker/commit/22ad4360f548e54bb0c5e929f8c84a186ad2ab88)
+
 ## Wazuh Docker v3.9.1_6.8.0
 
 ### Added
diff --git a/VERSION b/VERSION
index 3e8fc28f..92cf5618 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.9.1_6.8.0"
-REVISION="3901"
\ No newline at end of file
+WAZUH-DOCKER_VERSION="3.9.1_7.1.0"
+REVISION="3911"
\ No newline at end of file
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index b235c9fa..a5e42fd5 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -3,7 +3,7 @@ FROM docker.elastic.co/kibana/kibana:7.1.0
 ARG WAZUH_APP_VERSION=3.9.1_7.1.0
 USER root
 
-ADD  https://packages.wazuh.com/wazuhapp/wazuhapp-3.9.1_7.1.0.zip /tmp
+ADD  https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
 RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip 
 RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 5b191d97..9f822892 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -6,7 +6,7 @@ ARG WAZUH_VERSION=3.9.1-1
 ENV API_USER="foo" \
    API_PASS="bar"
 
-ENV TEMPLATE_VERSION="elastic-7-2"
+ENV TEMPLATE_VERSION="v3.9.1"
 
 # Set repositories.
 RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
@@ -69,7 +69,7 @@ RUN chmod +x /etc/service/wazuh-api/run && \
    chmod +x /etc/service/filebeat/run 
 
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/v3.9.1/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
+ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
 RUN chmod go-w /etc/filebeat/wazuh-template.json 
 
 # Run all services