diff --git a/.github/workflows/taco-release.yml b/.github/workflows/taco-release.yml
index 907bb79b6..2d33b5e2b 100644
--- a/.github/workflows/taco-release.yml
+++ b/.github/workflows/taco-release.yml
@@ -153,6 +153,7 @@ jobs:
           context: ./taco
           file: ./taco/Dockerfile_statesman
           push: true
+          platforms: linux/amd64,linux/arm64,linux/386
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
           build-args: |
diff --git a/taco/cmd/statesman/main.go b/taco/cmd/statesman/main.go
index 0c1b137ab..225251490 100644
--- a/taco/cmd/statesman/main.go
+++ b/taco/cmd/statesman/main.go
@@ -5,7 +5,8 @@ package main
 // Expecting automatic tag creation on merge
 // Testing binary cleanup to prevent dgctl contamination
 // Added workflow exclusions to prevent release collisions
-// Testing isolated taco releases without interference
+// Testing isolated taco releases without interference  
+// Testing multi-arch Docker builds with linux/amd64,arm64,386 support
 import (
 	"context"
 	"flag"
diff --git a/taco/cmd/taco/main.go b/taco/cmd/taco/main.go
index 8a559a2ff..8e3508000 100644
--- a/taco/cmd/taco/main.go
+++ b/taco/cmd/taco/main.go
@@ -6,6 +6,7 @@ package main
 // Full end-to-end test with cleanup and proper tagging
 // Fixed tag collision with existing release workflows
 // Should now have clean releases without dgctl contamination
+// Testing multi-arch Docker builds and Helm-compatible tags
 import (
     "fmt"
     "os"