diff --git a/.gitea/workflows/build-gitea-runner.yaml b/.gitea/workflows/build-gitea-runner.yaml
index 199e89b..32c0743 100644
--- a/.gitea/workflows/build-gitea-runner.yaml
+++ b/.gitea/workflows/build-gitea-runner.yaml
@@ -58,4 +58,17 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/gitea-runner/archlinux:latest"
+      -
+        name: Build and push pnpm image
+        uses: docker/build-push-action@v6
+        with:
+          builder: multiplatform-builder
+          context: "{{defaultContext}}:gitea-runner"
+          target: pnpm
+          platforms: |
+            linux/amd64
+          push: true
+          pull: true
+          tags: |
+            "gitea.woggioni.net/woggioni/gitea-runner/pnpm:latest"
 
diff --git a/gitea-runner/Dockerfile b/gitea-runner/Dockerfile
index 8298e61..0210517 100644
--- a/gitea-runner/Dockerfile
+++ b/gitea-runner/Dockerfile
@@ -52,3 +52,10 @@ RUN ln -s /opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-muslea
 RUN ln -s /opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-musleabi-gcc /usr/local/bin/arm-linux-musleabi-gcc
 RUN ln -s /opt/x-tools/x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc /usr/local/bin/x86_64-pc-windows-gnu-gcc
 RUN useradd gitea-runner -u 555 -s /bin/bash -m -d /var/lib/gitea-runner
+
+FROM alpine:3.24 AS pnpm
+RUN --mount=type=cache,target=/var/cache/apk apk update
+RUN --mount=type=cache,target=/var/cache/apk apk add nodejs shadow git pnpm
+RUN adduser -S -u 555 -h /var/lib/gitea-runner gitea-runner
+USER gitea-runner
+WORKDIR /var/lib/gitea-runner