diff --git a/docker/cowrie/docker-compose.yml b/docker/cowrie/docker-compose.yml
index c4bf0a43..cfbb272c 100644
--- a/docker/cowrie/docker-compose.yml
+++ b/docker/cowrie/docker-compose.yml
@@ -18,7 +18,7 @@ services:
      - NET_BIND_SERVICE
     ports:
      - "22:2222"
-     - "23:2323"
+     - "23:2223"
     image: "dtagdevsec/cowrie:1804"
     volumes:
      - /data/cowrie/downloads:/home/cowrie/cowrie/dl
diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index b2aaf0f0..fca17dd3 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -8,7 +8,6 @@ RUN apk -U upgrade && \
     apk add bash \
             build-base \
             git \
-            libcap \
             libffi-dev \
             libressl-dev \
             postgresql-dev \
@@ -32,7 +31,15 @@ RUN apk -U upgrade && \
     mkdir -p /var/log/heralding/ && \
 
 # Clean up
-    apk del git && \
+    apk del --purge \
+            build-base \
+            git \
+            libffi-dev \
+            libressl-dev \
+            postgresql-dev \
+            python3-dev \
+            py-virtualenv && \
+    apk add libzmq && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/*
 
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 9eeb64e5..bfe5ff7b 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -6,7 +6,10 @@ ADD dist/ /root/dist/
 
 # Get and install dependencies & packages
 RUN apk -U upgrade && \
-    apk add bash nginx nginx-mod-http-headers-more procps && \
+    apk add bash \
+            nginx \
+            nginx-mod-http-headers-more \
+            procps && \
 
 # Setup configs
     mkdir -p /run/nginx && \
diff --git a/etc/compose/tpot.yml b/etc/compose/tpot.yml
index 8c0277a9..76e70723 100644
--- a/etc/compose/tpot.yml
+++ b/etc/compose/tpot.yml
@@ -40,7 +40,7 @@ services:
      - NET_BIND_SERVICE
     ports:
      - "22:2222"
-     - "23:2323"
+     - "23:2223"
     image: "dtagdevsec/cowrie:1804"
     volumes:
      - /data/cowrie/downloads:/home/cowrie/cowrie/dl