diff --git a/docker-compose.yml b/docker-compose.yml
index b2b1fb30..30dc6f4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,13 +7,12 @@ services:
     ports:
       - "1514/udp:1514/udp"
       - "1515:1515"
-      - "514/udp:514/udp"
+#      - "514/udp:514/udp"
       - "55000:55000"
     networks:
       - docker_elk
     volumes:
-      - /mnt:/var/ossec/data
-
+      - /mnt/data/ossec/wazuh:/var/ossec/data
     depends_on:
       - elasticsearch
   elasticsearch:
@@ -24,9 +23,9 @@ services:
       - "9200:9200"
       - "9300:9300"
     environment:
-      ES_JAVA_OPTS: "-Xms5g -Xmx5g"
-#    volumes:
-#      - volume-path:/usr/share/elasticsearch/data
+      ES_JAVA_OPTS: "-Xms64g -Xmx64g"
+    volumes:
+      - /mnt/data/ossec/elasticsearch:/usr/share/elasticsearch/data
     networks:
       - docker_elk
   logstash:
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index bb2d8dcd..9a509260 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,8 +1,7 @@
 FROM logstash:5.1.2
 
 RUN apt-get update
-RUN groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec &&\
-    usermod -a -G ossec logstash
+
 COPY config/logstash.conf /etc/logstash/conf.d/logstash.conf
 COPY config/wazuh-elastic5-template.json /etc/logstash/wazuh-elastic5-template.json
 
diff --git a/logstash/config/run.sh b/logstash/config/run.sh
index ddbd7bc9..55d3de67 100644
--- a/logstash/config/run.sh
+++ b/logstash/config/run.sh
@@ -12,6 +12,11 @@
 #
 
 set -e
+host="elasticsearch"
+until curl -XGET $host:9200; do
+  >&2 echo "Elastic is unavailable - sleeping"
+  sleep 1
+done
 
 # Add logstash as command if needed
 if [ "${1:0:1}" = '-' ]; then