diff --git a/docker/adbhoney/dist/cpu_check.py b/docker/adbhoney/dist/cpu_check.py
index 13245287..bc465108 100644
--- a/docker/adbhoney/dist/cpu_check.py
+++ b/docker/adbhoney/dist/cpu_check.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 if len(sys.argv) != 3:
-    print("Usage: script.py <PID> <CPU_USAGE_THRESHOLD>")
+    print("Usage: cpu_check.py <PID> <CPU_USAGE_THRESHOLD>")
     sys.exit(1)
 
 try:
diff --git a/docker/conpot/dist/cpu_check.py b/docker/conpot/dist/cpu_check.py
index 13245287..bc465108 100644
--- a/docker/conpot/dist/cpu_check.py
+++ b/docker/conpot/dist/cpu_check.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 if len(sys.argv) != 3:
-    print("Usage: script.py <PID> <CPU_USAGE_THRESHOLD>")
+    print("Usage: cpu_check.py <PID> <CPU_USAGE_THRESHOLD>")
     sys.exit(1)
 
 try:
diff --git a/docker/dionaea/Dockerfile b/docker/dionaea/Dockerfile
index 78e9cf79..e2c64d94 100644
--- a/docker/dionaea/Dockerfile
+++ b/docker/dionaea/Dockerfile
@@ -40,7 +40,6 @@ RUN ARCH=$(arch) && \
 		python3-boto3 \
 		python3-bson \
 		python3-yaml \
-		python3-psutil \
 		fonts-liberation && \
 #
 # Get and install dionaea
@@ -96,6 +95,7 @@ RUN ARCH=$(arch) && \
       python3 \
       python3-boto3 \
       python3-bson \
+      python3-psutil \
       python3-yaml \
       libcurl4 \
       libemu2 \
diff --git a/docker/dionaea/dist/cpu_check.py b/docker/dionaea/dist/cpu_check.py
index 13245287..bc465108 100644
--- a/docker/dionaea/dist/cpu_check.py
+++ b/docker/dionaea/dist/cpu_check.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 if len(sys.argv) != 3:
-    print("Usage: script.py <PID> <CPU_USAGE_THRESHOLD>")
+    print("Usage: cpu_check.py <PID> <CPU_USAGE_THRESHOLD>")
     sys.exit(1)
 
 try:
diff --git a/docker/endlessh/docker-compose.yml b/docker/endlessh/docker-compose.yml
index 4711f099..1a7bbe83 100644
--- a/docker/endlessh/docker-compose.yml
+++ b/docker/endlessh/docker-compose.yml
@@ -19,4 +19,4 @@ services:
     image: "dtagdevsec/endlessh:alpha"
     read_only: true
     volumes:
-     - /data/endlessh/log:/var/log/endlessh
+     - $HOME/tpotce/data/endlessh/log:/var/log/endlessh
diff --git a/docker/ewsposter/Dockerfile b/docker/ewsposter/Dockerfile
index f3b0ccfe..d35d919b 100644
--- a/docker/ewsposter/Dockerfile
+++ b/docker/ewsposter/Dockerfile
@@ -1,29 +1,30 @@
-FROM alpine:3.17
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
 RUN apk -U --no-cache add \
-            build-base \
-            git \
-            libffi-dev \
-            libssl1.1 \
-            openssl-dev \
-	    python3 \
-            python3-dev \
-            py3-cffi \
-	    py3-cryptography \
-            py3-ipaddress \
-	    py3-lxml \
-	    py3-mysqlclient \
-	    py3-openssl \
-            py3-requests \
-	    py3-pip \
-            py3-setuptools \
-            py3-wheel && \
-    pip3 install --upgrade pip && \
-    pip3 install --no-cache-dir configparser hpfeeds3 influxdb influxdb-client xmljson && \
+		build-base \
+		git \
+		libffi-dev \
+		libssl3 \
+		openssl-dev \
+		python3 \
+		python3-dev \
+		py3-cffi \
+		py3-cryptography \
+		py3-ipaddress \
+		py3-lxml \
+		py3-mysqlclient \
+		py3-openssl \
+		py3-requests \
+		py3-pip \
+		py3-setuptools \
+		py3-wheel && \
+	pip3 install --break-system-packages --upgrade pip && \
+	pip3 install --break-system-packages --no-cache-dir configparser hpfeeds3 influxdb influxdb-client xmljson && \
+
 #
 # Setup ewsposter
     git clone https://github.com/telekom-security/ewsposter -b v1.25.0 /opt/ewsposter && \
@@ -41,10 +42,10 @@ RUN apk -U --no-cache add \
 #
 # Clean up
     apk del build-base \
-            git \
-            openssl-dev \
-            python3-dev \
-            py-setuptools && \
+		git \
+		openssl-dev \
+		python3-dev \
+		py-setuptools && \
     rm -rf /root/* /var/cache/apk/* /opt/ewsposter/.git
 #
 # Run ewsposter
diff --git a/docker/ewsposter/docker-compose.yml b/docker/ewsposter/docker-compose.yml
index 6f296779..4e116040 100644
--- a/docker/ewsposter/docker-compose.yml
+++ b/docker/ewsposter/docker-compose.yml
@@ -21,11 +21,9 @@ services:
      - EWS_HPFEEDS_CHANNELS=channels
      - EWS_HPFEEDS_IDENT=user
      - EWS_HPFEEDS_SECRET=secret
-     - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem
+     - EWS_HPFEEDS_TLSCERT=false
      - EWS_HPFEEDS_FORMAT=json
-    env_file:
-     - /opt/tpot/etc/compose/elk_environment
     image: "dtagdevsec/ewsposter:alpha"
     volumes:
-     - /data:/data
-#     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip
+     - $HOME/tpotce/data:/data
+     - $HOME/tpotce/data/ews/conf/ews.ip:/opt/ewsposter/ews.ip
diff --git a/docker/tpotinit/Dockerfile b/docker/tpotinit/Dockerfile
index c62374aa..ed1445b5 100644
--- a/docker/tpotinit/Dockerfile
+++ b/docker/tpotinit/Dockerfile
@@ -41,6 +41,7 @@ RUN apk --no-cache -U add \
 #
 # Run tpotinit
 WORKDIR /opt/tpot
-HEALTHCHECK --interval=5m --timeout=30s --retries=3 CMD pgrep -f autoheal || exit 1
+#HEALTHCHECK --interval=5s --timeout=30s --retries=3 CMD pgrep -f autoheal || exit 1
+HEALTHCHECK --retries=1000 --interval=5s CMD test -f /tmp/success || exit 1
 STOPSIGNAL SIGKILL
 CMD ["/opt/tpot/entrypoint.sh"]
diff --git a/docker/tpotinit/dist/entrypoint.sh b/docker/tpotinit/dist/entrypoint.sh
index 761489d9..a6e1ded3 100755
--- a/docker/tpotinit/dist/entrypoint.sh
+++ b/docker/tpotinit/dist/entrypoint.sh
@@ -300,6 +300,7 @@ echo
 figlet "Starting ..."
 figlet "T-Pot: ${TPOT_VERSION}"
 echo
+touch /tmp/success
 
 # We want to see true source for UDP packets in container (https://github.com/moby/libnetwork/issues/1994)
 # Start autoheal if running on a supported os
diff --git a/docker/tpotinit/docker-compose.yml b/docker/tpotinit/docker-compose.yml
index a5eece62..bcaaafe3 100644
--- a/docker/tpotinit/docker-compose.yml
+++ b/docker/tpotinit/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     env_file:
       - $HOME/tpotce/.env
     restart: "no" 
-    image: "ghcr.io/telekom-security/tpotinit:alpha"
+    image: "dtagdevsec/tpotinit:alpha"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - $HOME/tpotce/data:/data