diff --git a/docker-compose.yml b/docker-compose.yml
index dc52e9a5..0e33f7ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,66 +1,81 @@
 version: '2.1'
 services:
+  elasticsearch:
+    container_name: elasticsearch
+    environment:
+      - cluster.routing.allocation.disk.threshold_enabled=false
+      - discovery.type=single-node
+    hostname: elasticsearch
+    image: elasticsearch:7.3.2
+    network_mode: host
+  kibana:
+    container_name: kibana
+    extra_hosts:
+      - "elasticsearch:127.0.0.1"
+    hostname: kibana
+    image: kibana:7.3.2
+    network_mode: host
   kolab:
     build:
       context: ./docker/kolab/
     container_name: kolab
     depends_on:
       mariadb:
         condition: service_healthy
     extra_hosts:
       - "kolab.mgmt.com:127.0.0.1"
     healthcheck:
       interval: 10s
       test: test -f /tmp/kolab-init.done
       timeout: 5s
       retries: 30
     hostname: kolab.mgmt.com
     network_mode: host
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./docker/certs/ca.cert:/etc/pki/tls/certs/ca.cert:ro
       - ./docker/certs/ca.cert:/etc/pki/ca-trust/source/anchors/ca.cert:ro
       - ./docker/certs/kolab.hosted.com.cert:/etc/pki/tls/certs/kolab.hosted.com.cert
       - ./docker/certs/kolab.hosted.com.key:/etc/pki/tls/certs/kolab.hosted.com.key
       - ./docker/certs/kolab.mgmt.com.cert:/etc/pki/tls/certs/kolab.mgmt.com.cert
       - ./docker/certs/kolab.mgmt.com.key:/etc/pki/tls/certs/kolab.mgmt.com.key
       - ./docker/kolab/utils:/root/utils:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   mariadb:
     container_name: mariadb
     environment:
       MYSQL_ROOT_PASSWORD: Welcome2KolabSystems
     healthcheck:
       interval: 10s
       test: test -e /var/run/mysqld/mysqld.sock
       timeout: 5s
       retries: 30
     image: mariadb
     network_mode: host
   redis:
     container_name: redis-kolab
     image: redis
     network_mode: host
   worker:
     build:
       context: ./docker/worker/
     container_name: worker
     depends_on:
       kolab:
         condition: service_healthy
     hostname: worker
     network_mode: host
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./src:/home/worker/src.orig:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro