diff --git a/docker/Justfile b/docker/Justfile
index a5100b0..07ec4d7 100644
--- a/docker/Justfile
+++ b/docker/Justfile
@@ -12,6 +12,7 @@ VERSION := `git describe --tags --always --dirty 2>/dev/null || echo "dev"`
 GIT_COMMIT := `git rev-parse HEAD 2>/dev/null || echo "unknown"`
 DOCKERFILE := ROOT + "/docker/Dockerfile"
 RELEASE := ROOT + "/dist"
+DEFAULT_TAGS := "-t cachew:" + TAG
 
 # Build Docker image for local development
 build:
@@ -26,7 +27,7 @@ build:
     @echo "✓ Built cachew:local"
 
 # Build multi-arch Docker image (builds for amd64 + arm64, stays in cache)
-build-multi:
+build-multi *extra_args=(DEFAULT_TAGS):
     @echo "Building Linux binaries for amd64 and arm64..."
     @just -f {{ ROOT }}/Justfile build linux amd64
     @just -f {{ ROOT }}/Justfile build linux arm64
@@ -37,9 +38,9 @@ build-multi:
         -f {{ DOCKERFILE }} \
         --build-arg VERSION={{ VERSION }} \
         --build-arg GIT_COMMIT={{ GIT_COMMIT }} \
-        -t cachew:{{ TAG }} \
+        {{ extra_args }} \
         {{ ROOT }}
-    @echo "✓ Built multi-arch image (in cache)"
+    @echo "✓ Built multi-arch image"
 
 # Run in Docker (usage: just docker run [log_level])
 run log_level="info": build