diff --git a/admission-server/Dockerfile b/admission-server/Dockerfile
index c7dff8c823..c52a144601 100644
--- a/admission-server/Dockerfile
+++ b/admission-server/Dockerfile
@@ -20,7 +20,7 @@ RUN pnpm run --filter=./admission-server build
 # Deploy
 RUN pnpm --filter=./admission-server --prod deploy pruned
 
-FROM --platform=${BUILDPLATFORM} node:lts-slim
+FROM --platform=${TARGETPLATFORM} node:lts-slim
 
 WORKDIR /app
 
diff --git a/cdn-server/Dockerfile b/cdn-server/Dockerfile
index 920517c88f..8c8cb2a012 100644
--- a/cdn-server/Dockerfile
+++ b/cdn-server/Dockerfile
@@ -21,7 +21,7 @@ RUN pnpm run --filter=./cdn-server/cdn --filter=./cdn-server build
 # Deploy
 RUN pnpm --filter=./cdn-server --prod deploy pruned
 
-FROM --platform=${BUILDPLATFORM} node:lts-slim
+FROM --platform=${TARGETPLATFORM} node:lts-slim
 
 WORKDIR /app
 
diff --git a/controlplane/Dockerfile b/controlplane/Dockerfile
index 146e2c3c37..ba23c994d7 100644
--- a/controlplane/Dockerfile
+++ b/controlplane/Dockerfile
@@ -32,7 +32,7 @@ RUN curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/relea
 # Deploy
 RUN pnpm --filter=./controlplane --prod deploy pruned
 
-FROM --platform=${BUILDPLATFORM} node:lts-alpine
+FROM --platform=${TARGETPLATFORM} node:lts-alpine
 
 WORKDIR /app
 
diff --git a/graphqlmetrics/Dockerfile b/graphqlmetrics/Dockerfile
index 5f89a3a1e1..a7c0103589 100644
--- a/graphqlmetrics/Dockerfile
+++ b/graphqlmetrics/Dockerfile
@@ -23,7 +23,7 @@ RUN make test
 # Build router
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-extldflags -static -X github.com/wundergraph/cosmo/graphqlmetrics/core.Version=${VERSION}" -a -o graphqlmetrics cmd/main.go
 
-FROM --platform=${BUILDPLATFORM} gcr.io/distroless/base-debian12
+FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-debian12
 
 COPY --from=builder /app/graphqlmetrics /graphqlmetrics
 COPY --from=builder /app/migrations /migrations
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 935eec6e21..2ecb83bb20 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -12,7 +12,7 @@ COPY ./theme .
 
 RUN ./build.sh
 
-FROM --platform=${BUILDPLATFORM} bitnamilegacy/keycloak:26.2.5
+FROM --platform=${TARGETPLATFORM} bitnamilegacy/keycloak:26.2.5
 
 COPY --from=0 /app/target/*.jar /opt/bitnami/keycloak/providers/
 
@@ -22,4 +22,4 @@ COPY --from=0 /app/target/*.jar /opt/bitnami/keycloak/providers/
 RUN /opt/bitnami/keycloak/bin/kc.sh build --db=postgres --metrics-enabled true --health-enabled true --http-relative-path "/"
 
 EXPOSE 8080
-EXPOSE 8443
\ No newline at end of file
+EXPOSE 8443
diff --git a/otelcollector/Dockerfile b/otelcollector/Dockerfile
index 560d99eb4b..0caf767ae0 100644
--- a/otelcollector/Dockerfile
+++ b/otelcollector/Dockerfile
@@ -12,11 +12,11 @@ RUN curl -LJO https://github.com/open-telemetry/opentelemetry-collector/releases
 
 COPY ./otelcol-builder.yaml ./otelcol-builder.yaml
 
-RUN ./ocb --config otelcol-builder.yaml \
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} ./ocb --config otelcol-builder.yaml \
     && chmod +x /app/otelcol-dev/otelcol \
     && /app/otelcol-dev/otelcol --version
 
-FROM --platform=${BUILDPLATFORM} golang:1.25
+FROM --platform=${TARGETPLATFORM} golang:1.25
 
 COPY ./otel-config.yaml /etc/otel-config.yaml
 COPY --from=builder /app/otelcol-dev/otelcol /otelcol
@@ -24,6 +24,5 @@ COPY --from=builder /app/otelcol-dev/otelcol /otelcol
 # smoke test
 RUN /otelcol --version
 
-
 ENTRYPOINT ["/otelcol"]
 CMD ["--config", "/etc/otel-config.yaml"]
diff --git a/router/Dockerfile b/router/Dockerfile
index 50ad4410d2..eda7771cee 100644
--- a/router/Dockerfile
+++ b/router/Dockerfile
@@ -31,7 +31,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
     -X 'github.com/wundergraph/cosmo/router/core.Date=${DATE}'" \
     -a -o router cmd/router/main.go
 
-FROM --platform=${BUILDPLATFORM} gcr.io/distroless/base-debian12:nonroot AS nonroot
+FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-debian12:nonroot AS nonroot
 
 # nonroot user uid
 USER 65532
@@ -45,7 +45,7 @@ CMD ["/router"]
 
 EXPOSE 3002
 
-FROM --platform=${BUILDPLATFORM} gcr.io/distroless/base-debian12
+FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-debian12
 
 COPY --from=builder /app/router /router
 
diff --git a/studio/Dockerfile b/studio/Dockerfile
index 3df71029d4..c682e16d5c 100644
--- a/studio/Dockerfile
+++ b/studio/Dockerfile
@@ -45,7 +45,7 @@ RUN pnpm buf generate --template buf.ts.gen.yaml
 
 RUN pnpm run --filter=./connect --filter=./shared --filter=./studio --filter=./composition build
 
-FROM --platform=${BUILDPLATFORM} node:lts-alpine
+FROM --platform=${TARGETPLATFORM} node:lts-alpine
 
 WORKDIR /app
 
@@ -68,4 +68,4 @@ EXPOSE 3000
 ENV PORT=3000
 ENV HOSTNAME=localhost
 
-CMD ["node", "./studio/server.js"]
\ No newline at end of file
+CMD ["node", "./studio/server.js"]