diff --git a/Dockerfile b/Dockerfile
index 08cf1600..f2cc2da1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,18 +6,23 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 WORKDIR /app
 
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     libpq-dev \
     curl \
     openssh-client \
     git \
-    nodejs \
-    npm \
+    ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
-# Install pnpm
-RUN npm install -g pnpm
+# Install Node 22 + pnpm
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends nodejs \
+    && corepack enable \
+    && corepack prepare pnpm@latest --activate \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 ENV PATH="/root/.local/bin:${PATH}"
@@ -32,7 +37,7 @@ RUN mkdir -p -m 0700 /root/.ssh \
 # We'll need access to private repos, let docker make use of host ssh agent and use it like:
 # docker build --ssh default -t envipath/envipy:1.0 .
 RUN --mount=type=ssh \
-    uv sync --locked --extra ms-login --extra pepper-plugin
+    uv sync --locked --extra pepper-plugin
 
 # Now copy source and do a final sync to install the project itself
 # Ensure .dockerignore is reasonable
diff --git a/package.json b/package.json
index bf4f1516..d2606698 100644
--- a/package.json
+++ b/package.json
@@ -21,5 +21,11 @@
     "django",
     "tailwindcss",
     "daisyui"
-  ]
+  ],
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "@tailwindcss/oxide"
+    ]
+  }
 }
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index bff00c56..a50dd184 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,5 @@
+allowBuilds:
+  '@parcel/watcher': true
 onlyBuiltDependencies:
   - '@parcel/watcher'
   - '@tailwindcss/oxide'