diff --git a/distribution/Dockerfile b/distribution/Dockerfile
index 601502f2..38d425f6 100644
--- a/distribution/Dockerfile
+++ b/distribution/Dockerfile
@@ -2,7 +2,7 @@
 # Based on ubuntu:latest, installs WiseMapping (http://ww.wisemapping.org)
 
 # Based info setup ...
-FROM tomcat:9.0.71-jdk17
+FROM --platform=$BUILDPLATFORM tomcat:9.0.71-jdk17
 LABEL maintainer="Paulo Gustavo Veiga <pveiga@wisemapping.com>"
 
 # Build variables ...
diff --git a/distribution/build-image.sh b/distribution/build-image.sh
index ad4f6232..8d0815a8 100755
--- a/distribution/build-image.sh
+++ b/distribution/build-image.sh
@@ -4,4 +4,7 @@ set -o
 set -u
 
 mvn -f ../pom.xml clean package
-docker build --platform linux/amd64 -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
+#docker build --platform linux/amd64 -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
+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/