diff --git a/bin/setup_builder.sh b/bin/setup_builder.sh
new file mode 100755
index 00000000..283faff1
--- /dev/null
+++ b/bin/setup_builder.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Got root?
+myWHOAMI=$(whoami)
+if [ "$myWHOAMI" != "root" ]
+  then
+    echo "Need to run as root ..."
+    exit
+fi
+
+# Only run with command switch
+if [ "$1" != "-y" ]; then
+  echo "### Setting up docker for Multi Arch Builds."
+  echo "### Use on x64 only!"
+  echo "### Run with -y to install!"
+  echo
+  exit
+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
+chmod +x docker-buildx
+
+docker buildx ls
+
+# We need to create a new builder as the default one cannot handle multi-arch builds
+# https://docs.docker.com/desktop/multi-arch/
+docker buildx create --name mybuilder
+
+# Set as default
+docker buildx use mybuilder
+
+# We need to install emulators, arm64 should be fine for now
+# https://github.com/tonistiigi/binfmt/
+docker run --privileged --rm tonistiigi/binfmt --install arm64
+
+# Check if everything is setup correctly
+docker buildx inspect --bootstrap
+echo
+echo "### Done."
+echo
+echo "Example: docker buildx build --platform linux/amd64,linux/arm64 -t username/demo:latest --push ."
+echo "Docs: https://docs.docker.com/desktop/multi-arch/"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0353324d..f85d066d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -32,6 +32,11 @@ services:
     build: cowrie/.
     image: "dtagdevsec/cowrie:2203"
 
+# Ddospot service
+  ddospot:
+    build: ddospot/.
+    image: "dtagdevsec/ddospot:2203"
+
 # Dicompot service
   dicompot:
     build: dicompot/.
@@ -47,21 +52,46 @@ services:
     build: elasticpot/.
     image: "dtagdevsec/elasticpot:2203"
 
+# Endlessh service
+  endlessh:
+    build: endlessh/.
+    image: "dtagdevsec/endlessh:2203"
+
 # Glutton service
   glutton:
     build: glutton/.
     image: "dtagdevsec/glutton:2203"
 
+# Hellpot service
+  hellpot:
+    build: hellpot/.
+    image: "dtagdevsec/hellpot:2203"
+
 # Heralding service
   heralding:
     build: heralding/.
     image: "dtagdevsec/heralding:2203"
 
+# Honeypots service
+  honeypots:
+    build: honeypots/.
+    image: "dtagdevsec/honeypots:2203"
+
 # Honeytrap service
   honeytrap:
     build: honeytrap/.
     image: "dtagdevsec/honeytrap:2203"
 
+# IPPHoney service
+  ipphoney:
+    build: ipphoney/.
+    image: "dtagdevsec/ipphoney:2203"
+
+# Log4Pot service
+  log4pot:
+    build: log4pot/.
+    image: "dtagdevsec/log4pot:2203"
+
 # Mailoney service
   mailoney:
     build: mailoney/.
@@ -77,6 +107,11 @@ services:
     build: rdpy/.
     image: "dtagdevsec/rdpy:2203"
 
+# Redishoneypot service
+  rdpy:
+    build: redishoneypot/.
+    image: "dtagdevsec/redishoneypot:2203"
+
 #### Snare / Tanner
 ## Tanner Redis Service
   tanner_redis: