diff --git a/docker/ciscoasa/docker-compose.yml b/docker/ciscoasa/docker-compose.yml
index 65ef87fe..59ff0ebb 100644
--- a/docker/ciscoasa/docker-compose.yml
+++ b/docker/ciscoasa/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '2.3'
 
 networks:
   ciscoasa_local:
diff --git a/docker/conpot/docker-compose.yml b/docker/conpot/docker-compose.yml
index 2b68e5b0..462f2108 100644
--- a/docker/conpot/docker-compose.yml
+++ b/docker/conpot/docker-compose.yml
@@ -1,5 +1,5 @@
 # CONPOT TEMPLATE=[default, IEC104, guardian_ast, ipmi, kamstrup_382, proxy]
-version: '2.2'
+version: '2.3'
 
 networks:
   conpot_local_default:
diff --git a/docker/cowrie/docker-compose.yml b/docker/cowrie/docker-compose.yml
index 9e77a102..3b07ac33 100644
--- a/docker/cowrie/docker-compose.yml
+++ b/docker/cowrie/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '2.3'
 
 networks:
   cowrie_local:
diff --git a/docker/dionaea/docker-compose.yml b/docker/dionaea/docker-compose.yml
index ff7878ee..2fcfe4ad 100644
--- a/docker/dionaea/docker-compose.yml
+++ b/docker/dionaea/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '2.3'
 
 services:
 
diff --git a/docker/elasticpot/Dockerfile b/docker/elasticpot/Dockerfile
index 4b7a04b8..d97b3b11 100644
--- a/docker/elasticpot/Dockerfile
+++ b/docker/elasticpot/Dockerfile
@@ -4,22 +4,21 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Install packages
-RUN apk -U upgrade && \ 
-    apk add bash \
-            git \
-            python3 && \
-    pip3 install --upgrade pip && \
-    pip3 install bottle \
-                 configparser \
-                 datetime \
-                 requests && \
+RUN apk -U --no-cache add \
+             git \
+             python3 && \
+    pip3 install --no-cache-dir --upgrade pip && \
+    pip3 install --no-cache-dir bottle \
+                                configparser \
+                                datetime \
+                                requests && \
     mkdir -p /opt && \
     cd /opt/ && \
     git clone https://github.com/schmalle/ElasticpotPY.git && \
 
 # Setup user, groups and configs
     addgroup -g 2000 elasticpot && \
-    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 elasticpot && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 elasticpot && \
     mv /root/dist/elasticpot.cfg /opt/ElasticpotPY/ && \
     mkdir /opt/ElasticpotPY/log && \
 
diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml
index a2dce37c..0dd8627a 100644
--- a/docker/elasticpot/docker-compose.yml
+++ b/docker/elasticpot/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '2.3'
 
 networks:
   elasticpot_local:
diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml
index 3019cab0..eace0337 100644
--- a/docker/elk/docker-compose.yml
+++ b/docker/elk/docker-compose.yml
@@ -1,6 +1,4 @@
-# T-Pot (Standard)
-# For docker-compose ...
-version: '2.2'
+version: '2.3'
 
 services:
 
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index ee29daa9..588ad964 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -50,5 +50,4 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
 
 # Start logstash
 #USER logstash:logstash
-#CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf
-CMD exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf
+CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf
diff --git a/docker/elk/logstash/docker-compose.yml b/docker/elk/logstash/docker-compose.yml
index fb21ac66..f5eed0dc 100644
--- a/docker/elk/logstash/docker-compose.yml
+++ b/docker/elk/logstash/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '2.3'
 
 services:
 
diff --git a/docker/ews/dist/ews.cfg b/docker/ews/dist/ews.cfg
index c159379a..0b2a5cae 100644
--- a/docker/ews/dist/ews.cfg
+++ b/docker/ews/dist/ews.cfg
@@ -85,7 +85,7 @@ logfile = /data/emobility/log/centralsystemEWS.log
 [CONPOT]
 conpot = true
 nodeid = conpot-community-01
-logfile = /data/conpot/log/conpot.json
+logfile = /data/conpot/log/conpot*.json
 
 [ELASTICPOT]
 elasticpot = true
@@ -111,3 +111,8 @@ logfile = /data/rdpy/log/rdpy.log
 vnclowpot = true
 nodeid = vnclowpot-community-01
 logfile = /data/vnclowpot/log/vnclowpot.log
+
+[HERALDING]
+heralding = true
+nodeid = heralding-community-01
+logfile = /data/heralding/log/auth.csv
diff --git a/docker/heralding/dist/heralding.yml b/docker/heralding/dist/heralding.yml
index 8e03ef27..d91581b8 100644
--- a/docker/heralding/dist/heralding.yml
+++ b/docker/heralding/dist/heralding.yml
@@ -120,7 +120,7 @@ capabilities:
 
   https:
     enabled: true
-    port: 443
+    port: 8443
     timeout: 30
     protocol_specific_data:
       banner: ""
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index 44e2d11a..a894c4a4 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -25,7 +25,7 @@ services:
      - "80:80"
      - "110:110"
      - "143:143"
-     - "443:443"
+       #     - "443:443"
      - "993:993"
      - "995:995"
      - "5432:5432"