diff --git a/Makefile b/Makefile
index 9cfbc8d0..08145c27 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,12 @@ build-production: ## Build the production container image. Usage: make build-pro
 	@test -n "$(TAG)" || { echo "Usage: make build-production TAG=15.4.0" >&2; exit 1; }
 	@echo "Building image..."
 	@podman manifest rm registry.tanshu.com/brewman:latest 2>/dev/null || true
-	@podman build \
-		--format docker \
+	@git archive --format=tar "v$(TAG)" | podman build \
 		--platform linux/amd64,linux/arm64 \
 		--manifest registry.tanshu.com/brewman:latest \
 		--pull \
 		--build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(TAG) \
-		https://git.tanshu.com/tanshu/brewman.git#v$(TAG)
+		-
 
 	@echo "Pushing manifests..."
 	@podman manifest push --all registry.tanshu.com/brewman:latest docker://registry.tanshu.com/brewman:latest
@@ -20,13 +19,12 @@ build-check: ## Multi-arch build without push (compile check). Usage: make build
 	@test -n "$(TAG)" || { echo "Usage: make build-check TAG=15.4.0" >&2; exit 1; }
 	@echo "Building image..."
 	@podman manifest rm brewman:test 2>/dev/null || true
-	@podman build \
-		--format docker \
+	@git archive --format=tar "v$(TAG)" | podman build \
 		--platform linux/amd64,linux/arm64 \
 		--manifest brewman:test \
 		--pull \
 		--build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(TAG) \
-		https://git.tanshu.com/tanshu/brewman.git#v$(TAG)
+		-
 
 .PHONY: build-check-local
 # Defaults the version when built without a tag; an explicit TAG still wins.
@@ -35,7 +33,6 @@ build-check-local: ## Single-arch build without push (compile check). Usage: mak
 	@echo "Building image..."
 	@podman manifest rm brewman:test 2>/dev/null || true
 	@podman build \
-		--format docker \
 		--platform linux/amd64 \
 		--manifest brewman:test \
 		--no-cache \