diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
index 456b33ee..833d375d 100644
--- a/utils/docker/Dockerfile.focal
+++ b/utils/docker/Dockerfile.focal
@@ -13,7 +13,8 @@ RUN apt-get update && \
     # Create the pwuser
     adduser pwuser
 
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ARG PW_TARGET_ARCH
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===
 
diff --git a/utils/docker/build.sh b/utils/docker/build.sh
index 474a1152..fa604677 100755
--- a/utils/docker/build.sh
+++ b/utils/docker/build.sh
@@ -32,4 +32,6 @@ else
   exit 1
 fi
 
-docker build --platform "${PLATFORM}" -t "$3" -f "Dockerfile.$2" ../../
+PW_TARGET_ARCH=$(echo $1 | cut -c3-)
+
+docker build --platform "${PLATFORM}" --build-arg "PW_TARGET_ARCH=${PW_TARGET_ARCH}" -t "$3" -f "Dockerfile.$2" ../../
diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh
index 1301fbde..17e1c5fe 100755
--- a/utils/docker/publish_docker.sh
+++ b/utils/docker/publish_docker.sh
@@ -117,4 +117,5 @@ publish_docker_manifest () {
 }
 
 publish_docker_images_with_arch_suffix focal amd64
-publish_docker_manifest focal amd64
+publish_docker_images_with_arch_suffix focal arm64
+publish_docker_manifest focal amd64 arm64