diff --git a/Dockerfile b/Dockerfile
index 7bb5518..a8c2a49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.12-slim
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.4.10 /uv /bin/uv
 
 COPY uv.lock pyproject.toml ./
 RUN uv sync --frozen 
diff --git a/Makefile b/Makefile
index 6c798aa..4ef269c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ docker/run: docker/build
 	docker run -it --rm simulation
 
 docker/push: docker/build
-	docker tag simulation:latest $(DOCKER_REGISTRY)/simulation:latest
-	docker tag simulation:latest $(DOCKER_REGISTRY)/simulation:$(GIT_COMMIT_HASH)
-	docker push $(DOCKER_REGISTRY)/simulation:latest
-	docker push $(DOCKER_REGISTRY)/simulation:$(GIT_COMMIT_HASH)
+	docker buildx rm builder
+	docker buildx create --name builder --driver docker-container --use
+	docker buildx build --platform linux/amd64,linux/arm64 --push -t $(DOCKER_REGISTRY)/simulation:latest .
+	docker buildx build --platform linux/amd64,linux/arm64 --push -t $(DOCKER_REGISTRY)/simulation:$(GIT_COMMIT_HASH) .