diff --git a/README.md b/README.md
index 31aa43af..4daae703 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 ## Current release
 
-Containers are currently tested on Wazuh version 3.5.0 and Elastic Stack version 6.3.2. 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.6.0 and Elastic Stack version 6.4.0. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
 
 ## Installation notes
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8674ac2c..814cbc3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.5.0_6.3.2
+    image: wazuh/wazuh:3.6.0_6.4.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -22,7 +22,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.5.0_6.3.2
+    image: wazuh/wazuh-logstash:3.6.0_6.4.0
     hostname: logstash
     restart: always
 #    volumes:
@@ -38,7 +38,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.0
     hostname: elasticsearch
     restart: always
     ports:
@@ -60,7 +60,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.5.0_6.3.2
+    image: wazuh/wazuh-kibana:3.6.0_6.4.0
     hostname: kibana
     restart: always
 #    ports:
@@ -75,7 +75,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.5.0_6.3.2
+    image: wazuh/wazuh-nginx:3.6.0_6.4.0
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index d78cc5c5..8824df30 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.3.2
-ARG WAZUH_APP_VERSION=3.5.0_6.3.2
+FROM docker.elastic.co/kibana/kibana:6.4.0
+ARG WAZUH_APP_VERSION=3.6.0_6.4.0
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/3.5/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
+ADD https://raw.githubusercontent.com/wazuh/wazuh/3.6/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/logstash/Dockerfile b/logstash/Dockerfile
index b9a643f6..2760987e 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.3.2
+FROM docker.elastic.co/logstash/logstash:6.4.0
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 1cd51ebc..46d095b0 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.3.2
-ARG WAZUH_VERSION=3.5.0-1
+ARG FILEBEAT_VERSION=6.4.0
+ARG WAZUH_VERSION=3.6.0-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"