diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4b31b19a..11d185f4 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,7 +22,9 @@ RUN apt-get update \
 COPY --from=uv --chown=vscode: /uv /uvx /bin/
 
 # Install global NPM packages
-RUN npm install -g tslint-to-eslint-config typescript yarn react-app-rewired
+RUN npm install -g tslint-to-eslint-config typescript react-app-rewired \
+    && corepack enable \
+    && corepack prepare pnpm@10.28.2 --activate
 
 # Set default shell
 SHELL ["/bin/bash", "-c"]
\ No newline at end of file
diff --git a/.devcontainer/setupEnv.sh b/.devcontainer/setupEnv.sh
index a2f9ab8e..63d4a40d 100644
--- a/.devcontainer/setupEnv.sh
+++ b/.devcontainer/setupEnv.sh
@@ -18,7 +18,7 @@ cd ../../
 
 echo "Installing dependencies for ContentProcessorWeb..."
 cd ./src/ContentProcessorWeb
-yarn install
+pnpm install
 
 cd ../../