diff --git a/Makefile b/Makefile
index 80084bd..68644c9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
+PLATFORMS=linux/amd64
+
 help:
 	@echo "make help         Displays help"
 	@echo "     build        Builds the image"
 	@echo "     upload       Builds and uploads the image"
 	@echo "     prune-cache  Prunes the entire build cache"
 build:
-	docker buildx build -t git.staropensource.de/staropensource/actions-docker:latest -f Dockerfile .
-	docker buildx build -t git.staropensource.de/staropensource/actions-docker:java -f Dockerfile.java .
+	docker buildx rm actions-docker || true
+	docker buildx create --name actions-docker --bootstrap --use
+	docker buildx build --push --platform ${PLATFORMS} -t git.staropensource.de/staropensource/actions-docker:latest -f Dockerfile .
+	docker buildx build --push --platform ${PLATFORMS} -t git.staropensource.de/staropensource/actions-docker:java -f Dockerfile.java .
+	docker buildx rm actions-docker
 upload: build
 	docker push git.staropensource.de/staropensource/actions-docker:latest
 	docker push git.staropensource.de/staropensource/actions-docker:java