diff --git a/scripts/build_push_docker.sh b/scripts/build_push_docker.sh
index f8ff2750..9c59569a 100755
--- a/scripts/build_push_docker.sh
+++ b/scripts/build_push_docker.sh
@@ -11,12 +11,11 @@ else
 fi
 
 echo "building ${TAG}"
-docker build -t ${IMAGE_NAME}:${TAG} .
-
 echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-docker push ${IMAGE_NAME}:${TAG}
-
+tags=()
+tags+=${IMAGE_NAME}:${TAG}
 if [ -z "$(echo $TAG | grep -E "beta|master")" ]; then
-  docker tag ${IMAGE_NAME}:${TAG} ${IMAGE_NAME}:latest
-  docker push ${IMAGE_NAME}:latest
+  tags+={IMAGE_NAME}:latest
 fi
+
+docker buildx build --platform linux/amd64,linux/arm64 --push -t ${tags[@]} .