diff --git a/.env.sample b/.env.sample
index 29358d8..672e3c9 100644
--- a/.env.sample
+++ b/.env.sample
@@ -3,6 +3,7 @@
 ES_JAVA_OPTS=-Xms512m -Xmx512m
 ES_DATA=./docker-persistence/es/data
 HARNESS_LOGS=./docker-persistence/harness/logs
+HARNESS_DATA=./docker-persistence/harness/data
 MONGO_LOGS=./docker-persistence/mongo/logs
 MONGO_DATA=./docker-persistence/mongo/data/db
-CLI_DATA=./docker-persistence/harness-cli/data
+CLI_DATA=./docker-persistence/harness-cli/data
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index dedda72..14ac108 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,24 +7,21 @@ services:
     ports:
       - "9090:9090"
     environment:
-      #MONGO_HOST: mongo
-      #REST_SERVER_HOST: 0.0.0.0
-      #REST_SERVER_PORT: 9090
-      #ELASTICSEARCH_REST_HOST: elasticsearch
       MONGO_URI: mongodb://mongo:27017
       HARNESS_URI: http://0.0.0.0:9090
       ELASTICSEARCH_URI: http://elasticsearch:9200
+      HARNESS_MAX_REQUESTS: 16
+      HARNESS_MAX_CONNECTIONS: 1024
     depends_on:
       - mongo
       - elasticsearch
     volumes:
       - ${HARNESS_LOGS}:/harness/logs
-      #- ${CLI_DATA}:/harness-cli-data
-      - ${CLI_DATA}:/data
-
+      - ${HARNESS_DATA}:/data
+      
   mongo:
     restart: always
-    image: mongo:3.2
+    image: mongo:4.2
     container_name: mongo
     command: --logappend --logpath=/tmp/mongod.log
     ports:
@@ -35,25 +32,30 @@ services:
 
   elasticsearch:
     restart: always
-    image: elasticsearch:5.6.14-alpine
+    image: elasticsearch:7.6.0
     container_name: elasticsearch
     environment:
       ES_JAVA_OPTS: ${ES_JAVA_OPTS}
-      discovery.zen.ping.unicast.hosts: elasticsearch
+      discovery.seed_hosts: elasticsearch
       discovery.type: single-node
     ports:
-      - '9200:9200'
+      - "9200:9200"
     volumes:
       - ${ES_DATA}:/usr/share/elasticsearch/data
 
   harness-cli:
     restart: always
-    #image: actionml/harness-cli:latest
     image: actionml/harness-cli:develop
     container_name: harness-cli
     environment:
-        PATH: "$PATH:/harness-cli/harness-cli"
         HARNESS_SERVER_ADDRESS: harness
     volumes:
-    #- ${CLI_DATA}:/harness-cli-data
-    - ${CLI_DATA}:/data
+    - ${HARNESS_DATA}:/data
+
+  watchtower:
+    restart: always
+    image: v2tec/watchtower
+    container_name: watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --interval 3000