diff --git a/bin/setup_builder.sh b/bin/setup_builder.sh
index 283faff1..a8057549 100755
--- a/bin/setup_builder.sh
+++ b/bin/setup_builder.sh
@@ -20,7 +20,7 @@ fi
 # Main
 mkdir -p /root/.docker/cli-plugins/
 cd /root/.docker/cli-plugins/
-wget https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-amd64 -O docker-buildx
+wget https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-amd64 -O docker-buildx
 chmod +x docker-buildx
 
 docker buildx ls
diff --git a/docker/builder.sh b/docker/builder.sh
new file mode 100755
index 00000000..bdaa6b08
--- /dev/null
+++ b/docker/builder.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Setup Vars
+myPLATFORMS="linux/amd64,linux/arm64"
+myHUBORG="dtagdevsec"
+myTAG="2203"
+myIMAGESBASE="adbhoney ciscoasa citrixhoneypot conpot cowrie ddospot dicompot dionaea elasticpot endlessh ewsposter fatt glutton hellpot heralding honeypots honeytrap ipphoney log4pot mailoney medpot nginx p0f redishoneypot sentrypeer spiderfoot suricata wordpot"
+myIMAGESELK="elasticsearch kibana logstash map"
+myIMAGESTANNER="phpox redis snare tanner"
+myBUILDERLOG="builder.log"
+myBUILDERERR="builder.err"
+myBUILDCACHE="/buildcache"
+
+# Got root?
+myWHOAMI=$(whoami)
+if [ "$myWHOAMI" != "root" ]
+  then
+    echo "Need to run as root ..."
+    exit
+fi
+
+# Check for Buildx
+docker buildx > /dev/null 2>&1 
+if [ "$?" == "1" ];
+  then
+    echo "### Build environment not setup. Run bin/setup_builder.sh"
+fi
+
+# Only run with command switch
+if [ "$1" == "" ]; then
+  echo "### T-Pot Multi Arch Image Builder."
+  echo "## Usage: builder.sh [build, push]"
+  echo "## build - Just build images, do not push."
+  echo "## push - Build and push images."
+  echo "## Pushing requires an active docker login."
+  exit
+fi
+
+fuBUILDIMAGES () {
+local myPATH="$1"
+local myIMAGELIST="$2"
+local myPUSHOPTION="$3"
+
+for myREPONAME in $myIMAGELIST;
+  do
+    echo -n "Now building: $myREPONAME in $myPATH$myREPONAME/."
+    docker buildx build --cache-from "type=local,src=$myBUILDCACHE" --cache-to "type=local,dest=$myBUILDCACHE" --platform $myPLATFORMS -t $myHUBORG/$myREPONAME:$myTAG $myPUSHOPTION $myPATH$myREPONAME/. >> $myBUILDERLOG 2>&1
+    if [ "$?" != "0" ];
+      then
+	echo " [ ERROR ] - Check logs!"
+	echo "Error building $myREPONAME" >> "$myBUILDERERR"
+      else
+	echo " [ OK ]"
+    fi
+done
+}
+
+# Just build images
+if [ "$1" == "build" ];
+  then
+    mkdir -p $myBUILDCACHE
+    rm -f "$myBUILDERLOG" "$myBUILDERERR" 
+    echo "### Building images ..."
+    fuBUILDIMAGES "" "$myIMAGESBASE" ""
+    fuBUILDIMAGES "elk/" "$myIMAGESELK" ""
+    fuBUILDIMAGES "tanner/" "$myIMAGESTANNER" ""
+fi
+
+# Build and push images
+if [ "$1" == "push" ];
+  then
+    mkdir -p $myBUILDCACHE
+    rm -f "$myBUILDERLOG" "$myBUILDERERR" 
+    echo "### Building and pushing images ..."
+    fuBUILDIMAGES "" "$myIMAGESBASE" "--push"
+    fuBUILDIMAGES "elk/" "$myIMAGESELK" "--push"
+    fuBUILDIMAGES "tanner/" "$myIMAGESTANNER" "--push"
+fi
+
diff --git a/docker/ciscoasa/Dockerfile b/docker/ciscoasa/Dockerfile
index 988eecfc..ad64bfb1 100644
--- a/docker/ciscoasa/Dockerfile
+++ b/docker/ciscoasa/Dockerfile
@@ -26,6 +26,7 @@ RUN apk --no-cache -U upgrade && \
     git clone https://github.com/cymmetria/ciscoasa_honeypot && \
     cd ciscoasa_honeypot && \
     git checkout d6e91f1aab7fe6fc01fabf2046e76b68dd6dc9e2 && \
+    sed -i "s/git+git/git+https/g" requirements.txt && \
     pip3 install --no-cache-dir -r requirements.txt && \
     cp /root/dist/asa_server.py /opt/ciscoasa_honeypot && \
     chown -R ciscoasa:ciscoasa /opt/ciscoasa_honeypot && \
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index adfafa9b..6127b1fb 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -176,7 +176,7 @@ services:
 
 # Ewsposter service
   ewsposter:
-    build: ews/.
+    build: ewsposter/.
     image: "dtagdevsec/ewsposter:2203"
 
 # Nginx service
@@ -192,4 +192,4 @@ services:
 # Map Web Service
   map_web:
     build: elk/map/.
-    image: "dtagdevsec/map_server:2203"
\ No newline at end of file
+    image: "dtagdevsec/map:2203"
diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml
index c5d333b3..e8bb85ba 100644
--- a/docker/elk/docker-compose.yml
+++ b/docker/elk/docker-compose.yml
@@ -82,7 +82,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
     depends_on:
      - map_redis
 
@@ -96,6 +96,6 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
     depends_on:
      - map_redis
diff --git a/docker/elk/map/docker-compose.yml b/docker/elk/map/docker-compose.yml
index 0a4094c1..bfbae39e 100644
--- a/docker/elk/map/docker-compose.yml
+++ b/docker/elk/map/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
     depends_on:
      - map_redis
 
@@ -41,6 +41,6 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
     depends_on:
      - map_redis
diff --git a/docker/ews/Dockerfile b/docker/ewsposter/Dockerfile
similarity index 100%
rename from docker/ews/Dockerfile
rename to docker/ewsposter/Dockerfile
diff --git a/docker/ews/dist/ews.cfg b/docker/ewsposter/dist/ews.cfg
similarity index 100%
rename from docker/ews/dist/ews.cfg
rename to docker/ewsposter/dist/ews.cfg
diff --git a/docker/ews/docker-compose.yml b/docker/ewsposter/docker-compose.yml
similarity index 100%
rename from docker/ews/docker-compose.yml
rename to docker/ewsposter/docker-compose.yml
diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml
index 53595095..ee9de23a 100644
--- a/etc/compose/collector.yml
+++ b/etc/compose/collector.yml
@@ -184,7 +184,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -199,7 +199,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/hive.yml b/etc/compose/hive.yml
index 0eab80a9..e17532bf 100644
--- a/etc/compose/hive.yml
+++ b/etc/compose/hive.yml
@@ -87,7 +87,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -102,7 +102,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Nginx service
diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml
index 46618355..e69cd9df 100644
--- a/etc/compose/industrial.yml
+++ b/etc/compose/industrial.yml
@@ -355,7 +355,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -370,7 +370,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/log4j.yml b/etc/compose/log4j.yml
index 34f99575..105806ed 100644
--- a/etc/compose/log4j.yml
+++ b/etc/compose/log4j.yml
@@ -174,7 +174,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -189,7 +189,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/medical.yml b/etc/compose/medical.yml
index 7db4992e..b330e4e8 100644
--- a/etc/compose/medical.yml
+++ b/etc/compose/medical.yml
@@ -168,7 +168,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -183,7 +183,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/mini.yml b/etc/compose/mini.yml
index f2912da4..c14b1387 100644
--- a/etc/compose/mini.yml
+++ b/etc/compose/mini.yml
@@ -193,7 +193,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -208,7 +208,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml
index 26abfc8d..aed417e8 100644
--- a/etc/compose/nextgen.yml
+++ b/etc/compose/nextgen.yml
@@ -499,7 +499,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -514,7 +514,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml
index 433f11c7..ac572426 100644
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@@ -578,7 +578,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -593,7 +593,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service
diff --git a/etc/compose/tarpit.yml b/etc/compose/tarpit.yml
index 9666ff6b..9106611b 100644
--- a/etc/compose/tarpit.yml
+++ b/etc/compose/tarpit.yml
@@ -211,7 +211,7 @@ services:
     tty: true
     ports:
      - "127.0.0.1:64299:64299"
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 
 ## Map Data Service
   map_data:
@@ -226,7 +226,7 @@ services:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL
     tty: true
-    image: "dtagdevsec/map_server:2203"
+    image: "dtagdevsec/map:2203"
 #### /ELK
 
 # Ewsposter service