diff --git a/docker/build.sh b/docker/build.sh
index 22104934..5b65a6f5 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -10,9 +10,16 @@ else
     TAG="$VERSION"
 fi
 
-docker build --platform linux/amd64 --pull --rm -f 'Dockerfile' -t "dokploy/dokploy:${TAG}" .
+# Ensure Docker's buildx plugin is being used and set as the default builder
+BUILDER=$(docker buildx create --use)
+
+# Build and push the images for different architectures
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' --push .
 
 if [ "$BUILD_TYPE" != "canary" ]; then
-    # Tag the production build as latest
-    docker tag "dokploy/dokploy:${TAG}" "dokploy/dokploy:latest"
+    # Tag the production build as latest for all architectures and push
+    docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --pull --rm -t "dokploy/dokploy:latest" -f 'Dockerfile' --push .
 fi
+
+# Clean up the buildx builder instance
+docker buildx rm $BUILDER