diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index a4ba7d91..c18340c2 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -64,4 +64,4 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
 #
 # Start logstash
 USER logstash:logstash
-CMD entrypoint.sh && exec /usr/share/logstash/bin/logstash --config.reload.automatic
+CMD entrypoint.sh
diff --git a/docker/elk/logstash/dist/entrypoint.sh b/docker/elk/logstash/dist/entrypoint.sh
index 936c9932..2e92f100 100644
--- a/docker/elk/logstash/dist/entrypoint.sh
+++ b/docker/elk/logstash/dist/entrypoint.sh
@@ -6,6 +6,13 @@ function fuCLEANUP {
 }
 trap fuCLEANUP EXIT
 
+# Source ENVs from file ...
+if [ -f "/data/tpot/etc/compose/elk_environment" ];
+  then
+    echo "Found .env, now exporting ..."
+    set -o allexport && source "/data/tpot/etc/compose/elk_environment" && set +o allexport
+fi
+
 # Check internet availability 
 function fuCHECKINET () {
 mySITES=$1
@@ -85,3 +92,5 @@ if [ "$myTPOTILM" == "1" ];
     echo "T-Pot ILM already configured or ES not available."
 fi
 echo
+
+exec /usr/share/logstash/bin/logstash --config.reload.automatic
diff --git a/docker/ewsposter/Dockerfile b/docker/ewsposter/Dockerfile
index 54ad0fa9..f3b0ccfe 100644
--- a/docker/ewsposter/Dockerfile
+++ b/docker/ewsposter/Dockerfile
@@ -34,8 +34,10 @@ RUN apk -U --no-cache add \
     adduser -S -H -u 2000 -D -g 2000 ews && \
     chown -R ews:ews /opt/ewsposter && \
 #
-# Supply configs
+# Supply config and entrypoint.sh
     mv /root/dist/ews.cfg /opt/ewsposter/ && \
+    mv /root/dist/entrypoint.sh /usr/bin/ && \
+    chmod 755 /usr/bin/entrypoint.sh && \
 #
 # Clean up
     apk del build-base \
@@ -48,4 +50,4 @@ RUN apk -U --no-cache add \
 # Run ewsposter
 STOPSIGNAL SIGINT
 USER ews:ews
-CMD sleep 10 && exec /usr/bin/python3 -u /opt/ewsposter/ews.py -l $(shuf -i 10-60 -n 1)
+CMD /usr/bin/entrypoint.sh
diff --git a/docker/ewsposter/dist/entrypoint.sh b/docker/ewsposter/dist/entrypoint.sh
new file mode 100644
index 00000000..86685a24
--- /dev/null
+++ b/docker/ewsposter/dist/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/ash
+
+# Source ENVs from file ...
+if [ -f "/data/tpot/etc/compose/elk_environment" ];
+  then
+    echo "Found .env, now exporting ..."
+    set -o allexport && source "/data/tpot/etc/compose/elk_environment" && set +o allexport
+fi
+
+exec /usr/bin/python3 -u /opt/ewsposter/ews.py -l $(shuf -i 10-60 -n 1)