diff --git a/Dockerfile.embedr b/Dockerfile.embedr
index 260377e361..b134bfa486 100644
--- a/Dockerfile.embedr
+++ b/Dockerfile.embedr
@@ -11,10 +11,14 @@ ENV NVM_DIR=/usr/share/nvm
 # Go
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
-ENV GOARCH="amd64"
+ARG TARGETARCH
+ENV GOARCH=${TARGETARCH:-amd64}
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"
 
+# CI environment for pnpm
+ENV CI=true
+
 COPY . .
 
 #
@@ -29,9 +33,9 @@ RUN mkdir --parents $NVM_DIR && \
 RUN \. "$NVM_DIR/nvm.sh" && \
   nvm install $NODE_VERSION && \
   nvm use $NODE_VERSION && \
-  npm install --global pnpm@11.1.1 yarn && \
+  npm install --global pnpm@11.1.3 && \
   pnpm install --frozen-lockfile && \
-  cd bskyembed && yarn install --frozen-lockfile && cd .. && \
+  cd bskyembed && pnpm install --frozen-lockfile && cd .. && \
   pnpm intl:build && \
   pnpm build-embed
 
diff --git a/bskyembed/tsconfig.snippet.json b/bskyembed/tsconfig.snippet.json
index 837cfd36bb..f8db18cc6f 100644
--- a/bskyembed/tsconfig.snippet.json
+++ b/bskyembed/tsconfig.snippet.json
@@ -3,6 +3,7 @@
     "target": "ES2015",
     "lib": ["DOM", "ESNext"],
     "strict": true,
+    "rootDir": "snippet",
     "outDir": "dist"
   },
   "include": ["snippet"]
diff --git a/package.json b/package.json
index 1d7974f129..2fda0beb2b 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "build-ios": "pnpm use-build-number-with-bump eas build -p ios",
     "build-android": "pnpm use-build-number-with-bump eas build -p android",
     "build": "pnpm use-build-number-with-bump eas build",
-    "build-embed": "cd bskyembed && yarn build && yarn build-snippet && cd .. && node ./scripts/post-embed-build.js",
+    "build-embed": "cd bskyembed && pnpm build && pnpm build-snippet && cd .. && node ./scripts/post-embed-build.js",
     "start": "expo start --dev-client",
     "start:prod": "expo start --dev-client --no-dev --minify",
     "test": "NODE_ENV=test jest --forceExit --testTimeout=20000 --bail",