diff --git a/.circleci/config.yml b/.circleci/config.yml
index bebf97f653..079071ab2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,8 +24,8 @@ references:
     restore_cache:
       name: Restore pnpm cache
       keys:
-        - pnpm-cache-v1-{{ checksum "pnpm-lock.yaml" }}
-        - pnpm-cache-v1
+        - pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
+        - pnpm-cache-v2
 
   setup_pnpm: &setup_pnpm
     run:
@@ -33,8 +33,8 @@ references:
       command: |
         npm install --global corepack@latest
         corepack enable
-        corepack prepare pnpm@latest-10 --activate
-        pnpm config set store-dir ~/.pnpm-store
+        corepack prepare pnpm@11.0.5 --activate
+        echo 'export pnpm_config_store_dir="$PWD/.pnpm-store"' >> "$BASH_ENV"
 
   attach_workspace: &attach_workspace
     attach_workspace:
@@ -103,7 +103,7 @@ jobs:
       - *restore_pnpm_cache
       - *pnpm_install
       - save_cache:
-          key: pnpm-cache-v1-{{ checksum "pnpm-lock.yaml" }}
+          key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
           paths:
             - .pnpm-store
       - *persist_to_workspace
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 446b62bb6d..0000000000
--- a/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-min-release-age=7
-public-hoist-pattern[]=run-node
diff --git a/docs/README.md b/docs/README.md
index 6a9c4c3dc2..43c3b63970 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -17,7 +17,7 @@ developers to quickly build beautiful and consistent interfaces for our users.
 ### Prerequisites
 
 - `node@24`
-- `pnpm@10`
+- `pnpm@11`
 
 To install Atlantis locally for development:
 
diff --git a/package.json b/package.json
index a67ef0c055..8a845a1f7e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "atlantis",
   "version": "0.0.1",
-  "packageManager": "pnpm@10.33.0",
+  "packageManager": "pnpm@11.0.5",
   "license": "MIT",
   "scripts": {
     "bootstrap": "pnpm -r --if-present run bootstrap",
@@ -120,7 +120,7 @@
   ],
   "engines": {
     "node": "24",
-    "pnpm": "10"
+    "pnpm": "11"
   },
   "overrides": {
     "react": "19.1.1",
@@ -138,4 +138,4 @@
     }
   },
   "engineStrict": true
-}
\ No newline at end of file
+}
diff --git a/packages/site/package.json b/packages/site/package.json
index 24ebb0914b..70f6d467b4 100644
--- a/packages/site/package.json
+++ b/packages/site/package.json
@@ -2,7 +2,7 @@
   "name": "@jobber/atlantis-site",
   "private": true,
   "version": "0.60.0",
-  "packageManager": "pnpm@10.33.0",
+  "packageManager": "pnpm@11.0.5",
   "type": "module",
   "scripts": {
     "dev": "pnpm run bundle && pnpm run copyFiles && vite --force",
@@ -87,4 +87,4 @@
     "vfile": "^6.0.3",
     "vite": "^5.3.1"
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index dee51e928d..5fa7246f24 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,2 +1,12 @@
 packages:
   - "packages/*"
+allowBuilds:
+  '@parcel/watcher': set this to true or false
+  esbuild: set this to true or false
+  fsevents: set this to true or false
+  husky: set this to true or false
+  nx: set this to true or false
+
+minimumReleaseAge: 7
+publicHoistPattern:
+  - run-node
diff --git a/scripts/e2e.runner.sh b/scripts/e2e.runner.sh
index 45ab201e42..b055a32978 100644
--- a/scripts/e2e.runner.sh
+++ b/scripts/e2e.runner.sh
@@ -8,7 +8,7 @@ export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 corepack enable pnpm
 
 # Configure the pnpm store directory inside the mounted volume so it can be cached
-pnpm config set store-dir /pnpm-store
+export pnpm_config_store_dir=/pnpm-store
 
 # Install and prepare all dependencies
 pnpm install --ignore-scripts
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 1cb9ac474a..b083f88cdf 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -6,7 +6,7 @@ cd ../..
 # If --clean is supplied, delete existing docker volumes
 if [[ " $* " == *" --clean "* ]]; then
     echo "Cleaning up docker volumes for a fresh install..."
-    docker volume rm --force atlantis_pnpm_store atlantis_node_modules__root   atlantis_node_modules__components_native   atlantis_node_modules__components   atlantis_node_modules__design   atlantis_node_modules__eslint_config   atlantis_node_modules__formatters   atlantis_node_modules__generators   atlantis_node_modules__hooks   atlantis_node_modules__site   atlantis_node_modules__stylelint_config
+    docker volume rm --force atlantis_pnpm_store atlantis_pnpm_store_v11 atlantis_node_modules__root   atlantis_node_modules__components_native   atlantis_node_modules__components   atlantis_node_modules__design   atlantis_node_modules__eslint_config   atlantis_node_modules__formatters   atlantis_node_modules__generators   atlantis_node_modules__hooks   atlantis_node_modules__site   atlantis_node_modules__stylelint_config
 fi
 
 # NOTES:
@@ -31,7 +31,7 @@ echo "Running e2e tests inside a docker container..."
 # Run the e2e tests
 docker run --rm -it \
     -v $(pwd):/atlantis \
-    -v atlantis_pnpm_store:/pnpm-store/v10 \
+    -v atlantis_pnpm_store_v11:/pnpm-store/v11 \
     -v atlantis_node_modules__root:/atlantis/node_modules \
     -v atlantis_node_modules__components_native:/atlantis/packages/components-native/node_modules \
     -v atlantis_node_modules__components:/atlantis/packages/components/node_modules \