diff --git a/.travis.yml b/.travis.yml
index cfb1fcfd..ccb5c0bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,9 @@ before_install:
   - sudo apt-get -y install python3-pip python3-setuptools apache2-utils python3-venv
   - wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/116.0.5845.96/linux64/chromedriver-linux64.zip
   - unzip chromedriver-linux64.zip -d $HOME/.local/bin
+  - mkdir -vp ~/.docker/cli-plugins/
+  - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+  - chmod a+x ~/.docker/cli-plugins/docker-buildx
 install:
   - pip3 install -r requirements.txt
   - pip3 install pyasn1 --upgrade
@@ -82,4 +85,4 @@ deploy:
     on:
       tags: false
       all_branches: true
-      condition: "$TRAVIS_BRANCH =~ ^stable|master$"
+      condition: "$TRAVIS_BRANCH =~ ^stable|master|test-amd-build$"
diff --git a/tools/deploy_docker.sh b/tools/deploy_docker.sh
index 5ac6586e..73306b4a 100755
--- a/tools/deploy_docker.sh
+++ b/tools/deploy_docker.sh
@@ -19,13 +19,15 @@ else
   DOCKER_TAG="$TRAVIS_BRANCH"
 fi
 
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
 docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
 
-docker build -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" .
+docker buildx create --use
+docker buildx build --platform linux/amd64,linux/arm64 --push -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" .
 
 echo "NEW_GIT_TAG=$NEW_GIT_TAG"
 if [ ! -z "$NEW_GIT_TAG" ]; then
   docker tag "$IMAGE_NAME":"$DOCKER_TAG" "$IMAGE_NAME":"$NEW_GIT_TAG"
+  docker push "$IMAGE_NAME":"$NEW_GIT_TAG"
 fi
-
-docker push --all-tags "$IMAGE_NAME"