diff --git a/docker-compose.yml b/docker-compose.yml
index f45d2b1e..d0a5692c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,49 +1,36 @@
-# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.9.0_6.7.2
+    build: wazuh
     hostname: wazuh-manager
     restart: always
     ports:
-      - "1514:1514/udp"
-      - "1515:1515"
-      - "514:514/udp"
-      - "55000:55000"
-    depends_on:
-      - logstash
-  logstash:
-    image: wazuh/wazuh-logstash:3.9.0_6.7.2
-    hostname: logstash
-    restart: always
-    links:
-      - elasticsearch:elasticsearch
-    ports:
-      - "5000:5000"
-    depends_on:
-      - elasticsearch
-    environment:
-      - LS_HEAP_SIZE=2048m
+      - '1514:1514/udp'
+      - '1515:1515'
+      - '514:514/udp'
+      - '55000:55000'
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.9.0_6.7.2
+    build: elasticsearch
     hostname: elasticsearch
     restart: always
     ports:
-      - "9200:9200"
+      - '9200:9200'
     environment:
       - node.name=node-1
       - cluster.name=wazuh
-      - network.host=0.0.0.0
+      - network.host=localhost
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+      - 'ES_JAVA_OPTS=-Xms1g -Xmx1g'
     ulimits:
       memlock:
         soft: -1
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.9.0_6.7.2
+    build: kibana
     hostname: kibana
     restart: always
     depends_on:
@@ -52,15 +39,15 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.9.0_6.7.2
+    build: nginx
     hostname: nginx
     restart: always
     environment:
       - NGINX_PORT=443
       - NGINX_CREDENTIALS
     ports:
-      - "80:80"
-      - "443:443"
+      - '80:80'
+      - '443:443'
     depends_on:
       - kibana
     links: