diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 34556be..f173a69 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -38,10 +38,10 @@ jobs:
         include:
           - arch: linux/386
             arch_friendly: i386
-            s6_arch: x86
+            s6_arch: i686
           - arch: linux/amd64
             arch_friendly: amd64
-            s6_arch: amd64
+            s6_arch: x86_64
           - arch: linux/arm/v7
             arch_friendly: armv7
             s6_arch: armhf
diff --git a/Dockerfile b/Dockerfile
index 5b27d59..892fd9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental
 ARG ZM_VERSION=master
-ARG S6_ARCH=amd64
+ARG S6_ARCH=x86_64
 
 #####################################################################
 #                                                                   #
@@ -59,7 +59,7 @@ WORKDIR /s6downloader
 RUN set -x \
     && S6_OVERLAY_VERSION=$(wget --no-check-certificate -qO - https://api.github.com/repos/just-containers/s6-overlay/releases/latest | awk '/tag_name/{print $4;exit}' FS='[""]') \
     && S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:1} \
-    && wget -O /tmp/s6-overlay-arch.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64-${S6_OVERLAY_VERSION}.tar.xz" \
+    && wget -O /tmp/s6-overlay-arch.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}-${S6_OVERLAY_VERSION}.tar.xz" \
     && wget -O /tmp/s6-overlay-noarch.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch-${S6_OVERLAY_VERSION}.tar.xz" \
     && mkdir -p /tmp/s6 \
     && tar -Jxvf /tmp/s6-overlay-noarch.tar.xz -C /tmp/s6 \