diff --git a/deploy/docker/broker.Dockerfile b/deploy/docker/broker.Dockerfile
index e7f0a1e..1d413e5 100644
--- a/deploy/docker/broker.Dockerfile
+++ b/deploy/docker/broker.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates
diff --git a/deploy/docker/console.Dockerfile b/deploy/docker/console.Dockerfile
index 6353f7e..abaf6ed 100644
--- a/deploy/docker/console.Dockerfile
+++ b/deploy/docker/console.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates
 
diff --git a/deploy/docker/e2e-client.Dockerfile b/deploy/docker/e2e-client.Dockerfile
index ea882a9..9ee489d 100644
--- a/deploy/docker/e2e-client.Dockerfile
+++ b/deploy/docker/e2e-client.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates
diff --git a/deploy/docker/mcp.Dockerfile b/deploy/docker/mcp.Dockerfile
index f4acf4c..198be46 100644
--- a/deploy/docker/mcp.Dockerfile
+++ b/deploy/docker/mcp.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates
 
diff --git a/deploy/docker/operator.Dockerfile b/deploy/docker/operator.Dockerfile
index 2f9f9db..12f04c6 100644
--- a/deploy/docker/operator.Dockerfile
+++ b/deploy/docker/operator.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates
diff --git a/deploy/docker/proxy.Dockerfile b/deploy/docker/proxy.Dockerfile
index b2b9fc8..b7fdc68 100644
--- a/deploy/docker/proxy.Dockerfile
+++ b/deploy/docker/proxy.Dockerfile
@@ -3,8 +3,8 @@
 ARG GO_VERSION=1.25.2
 FROM golang:${GO_VERSION}-alpine@sha256:06cdd34bd531b810650e47762c01e025eb9b1c7eadd191553b91c9f2d549fae8 AS builder
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /src
 RUN apk add --no-cache git ca-certificates