diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile
index 45f336ea..f09f3ae2 100644
--- a/dockerbuild/Dockerfile
+++ b/dockerbuild/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
   # rpm is required for FPM to build rpm package
   # tclsh is required for building SQLite as part of SQLCipher
   # libsecret-1-dev is required even for prebuild keytar
-  apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
+  apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
   libsecret-1-dev \
   libopenjp2-tools \
   # Used by github actions \
@@ -51,4 +51,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no
 
 # Run platform-specific tasks
 COPY . /dockerbuild/
-RUN /dockerbuild/aarch64.sh
+RUN /dockerbuild/setup.sh
diff --git a/dockerbuild/aarch64.sh b/dockerbuild/setup.sh
similarity index 65%
rename from dockerbuild/aarch64.sh
rename to dockerbuild/setup.sh
index 6173532c..a97b411e 100755
--- a/dockerbuild/aarch64.sh
+++ b/dockerbuild/setup.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-if [ "$TARGETPLATFORM" = "linux/arm64" ]; then
+if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
+  apt-get -y install gcc-multilib g++-multilib
+elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then
   echo "Building for aarch64"
   apt-get -qq update
   apt-get -y install crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64