diff --git a/build.sh b/build.sh
index 591db39..e096584 100755
--- a/build.sh
+++ b/build.sh
@@ -4,12 +4,10 @@ set -e
 tag_latest=git.1e99.eu/1e99/passed:latest
 tag_commit=git.1e99.eu/1e99/passed:$(git rev-parse HEAD)
 
-# TODO: Figure out other platforms
-docker image build \
+docker buildx build \
+    --platform linux/amd64,linux/arm/v7,linux/arm64/v8 \
     --force-rm \
     --tag $tag_latest \
     --tag $tag_commit \
+    --push \
     .
-
-docker image push $tag_latest
-docker image push $tag_commit