diff --git a/docker-compose.yml b/docker-compose.yml
index 505a6f19..136969c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,27 +8,32 @@ services:
       - "1515:1515"
       - "514/udp:514/udp"
       - "55000:55000"
-#    networks:
-#      - docker_elk
+    networks:
+      - docker_elk
+#    volumes:
+#      - volume-path:/var/ossec/etc/data
+
     depends_on:
       - elasticsearch
   elasticsearch:
-    image: elasticsearch:latest
+    image: elasticsearch:5.1.2
     command: elasticsearch -E node.name="node-1" -E cluster.name="wazuh " -E network.host=0.0.0.0
     ports:
       - "9200:9200"
       - "9300:9300"
     environment:
-      ES_JAVA_OPTS: "-Xms1g -Xmx1g"
-#    networks:
-#      - docker_elk
+      ES_JAVA_OPTS: "-Xms3g -Xmx3g"
+#    volumes:
+#      - volume-path:/usr/share/elasticsearch/data
+    networks:
+      - docker_elk
   logstash:
     build: logstash/
     command: -f /etc/logstash/conf.d/
     ports:
       - "5000:5000"
-#    networks:
-#      - docker_elk
+    networks:
+      - docker_elk
     depends_on:
       - elasticsearch
     environment:
@@ -37,12 +42,12 @@ services:
     build: kibana/
     ports:
       - "5601:5601"
-#    networks:
-#      - docker_elk
+    networks:
+      - docker_elk
     depends_on:
       - elasticsearch
     entrypoint: sh wait-for-it.sh elasticsearch
 
-#networks:
-#  docker_elk:
-#    driver: bridge
+networks:
+  docker_elk:
+    driver: bridge
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 65dfa6e7..bb2d8dcd 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,4 +1,4 @@
-FROM logstash:latest
+FROM logstash:5.1.2
 
 RUN apt-get update
 RUN groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec &&\
diff --git a/wait-for-it.sh b/wait-for-it.sh
deleted file mode 100755
index cdbc01d7..00000000
--- a/wait-for-it.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-host="$1"
-shift
-cmd="$@"
-
-until curl -XGET $host:9200; do
-  >&2 echo "Elastic is unavailable - sleeping"
-  sleep 1
-done
-
->&2 echo "Elastic is up - executing command"
-exec $cmd
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 58b81365..7918d20c 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:latest
 
 COPY config/*.repo /etc/yum.repos.d/
 
diff --git a/wazuh/config/wazuh.repo b/wazuh/config/wazuh.repo
index 6161b05c..c1486ba4 100644
--- a/wazuh/config/wazuh.repo
+++ b/wazuh/config/wazuh.repo
@@ -3,5 +3,5 @@ gpgcheck=1
 gpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH
 enabled=1
 name=CENTOS-$releasever - Wazuh
-baseurl=https://packages.wazuh.com/yum/el/$releasever/$basearch
+baseurl=http://packages.wazuh.com.s3-website-us-west-1.amazonaws.com/yum/el/$releasever/$basearch
 protect=1