diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index d744c8c4..f5a57dfb 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -23,8 +23,9 @@ pipelines:
             - mvn -B verify --file pom.xml
             # Publish to docker repo ...
             - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
-            - docker build -t wisemapping/wisemapping:latest -f distribution/Dockerfile wise-webapp/target/
-            - docker push wisemapping/wisemapping:latest
+            - docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
+            - docker buildx inspect --bootstrap
+            - docker buildx build --platform=linux/amd64,linux/arm64 --push -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
           after-script:
             # Collect checkstyle results, if any, and convert to Bitbucket Code Insights.
             - pipe: atlassian/checkstyle-report:0.3.0