diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 66642b0..d3d6f21 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,7 +1,8 @@
 FROM debian:buster-slim
 
-ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
-RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
+ADD docker/scripts/install-s6.sh /
+RUN /install-s6.sh && \
+    rm /install-s6.sh
 ENTRYPOINT ["/init"]
 
 ADD docker/files/js8call/js8call-hamlib.patch /
diff --git a/docker/scripts/install-s6.sh b/docker/scripts/install-s6.sh
new file mode 100755
index 0000000..a3551e2
--- /dev/null
+++ b/docker/scripts/install-s6.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -eux pipefail
+
+BUILD_PACKAGES="wget ca-certificates"
+
+apt-get update
+apt-get -y install --no-install-recommends $BUILD_PACKAGES
+
+case `uname -m` in
+    arm*)
+        PLATFORM=armhf
+        ;;
+    aarch64*)
+        PLATFORM=aarch64
+        ;;
+    x86_64*)
+        PLATFORM=amd64
+        ;;
+esac
+
+pushd /tmp
+wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
+tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
+rm s6-overlay-${PLATFORM}.tar.gz
+popd
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*