diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 249c1599..9b52c029 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -5,7 +5,7 @@ FROM node:${NODE_VERSION}-slim AS base
 # FIX: Bad workaround (https://github.com/nodejs/corepack/issues/612)
 ENV COREPACK_INTEGRITY_KEYS=0
 
-RUN corepack enable && apt-get update && \
+RUN rm -f /usr/local/bin/pnpm /usr/local/bin/pnpx && npm install -g pnpm@10.6.2 && apt-get update && \
     apt-get install -y --no-install-recommends \
     ca-certificates \
     openssl \
diff --git a/apps/start/Dockerfile b/apps/start/Dockerfile
index 71a3647b..4c582ee6 100644
--- a/apps/start/Dockerfile
+++ b/apps/start/Dockerfile
@@ -5,7 +5,7 @@ FROM node:${NODE_VERSION}-slim AS base
 # FIX: Bad workaround (https://github.com/nodejs/corepack/issues/612)
 ENV COREPACK_INTEGRITY_KEYS=0
 
-RUN corepack enable && apt-get update && \
+RUN rm -f /usr/local/bin/pnpm /usr/local/bin/pnpx && npm install -g pnpm@10.6.2 && apt-get update && \
     apt-get install -y --no-install-recommends \
     ca-certificates \
     openssl \
@@ -39,8 +39,8 @@ COPY patches ./patches
 # Copy tracking script to self-hosting dashboard
 COPY apps/public/public/op1.js ./apps/start/public/op1.js
 
-# BUILD
-FROM base AS build
+# BUILD - run natively on the CI runner to avoid QEMU crashes (esbuild Go runtime)
+FROM --platform=$BUILDPLATFORM base AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     python3 \
diff --git a/apps/worker/Dockerfile b/apps/worker/Dockerfile
index 39d5c3fe..dfbd1f21 100644
--- a/apps/worker/Dockerfile
+++ b/apps/worker/Dockerfile
@@ -10,7 +10,7 @@ ENV DATABASE_URL=$DATABASE_URL
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
-RUN corepack enable && \
+RUN rm -f /usr/local/bin/pnpm /usr/local/bin/pnpx && npm install -g pnpm@10.6.2 && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     ca-certificates \