diff --git a/.github/workflows/ai-tests.yml b/.github/workflows/ai-tests.yml
index 90f94476155..64314d44fe7 100644
--- a/.github/workflows/ai-tests.yml
+++ b/.github/workflows/ai-tests.yml
@@ -36,7 +36,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Use Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/autofix_linters.yml b/.github/workflows/autofix_linters.yml
index 650d5776a82..548b97912d5 100644
--- a/.github/workflows/autofix_linters.yml
+++ b/.github/workflows/autofix_linters.yml
@@ -26,7 +26,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - uses: actions/setup-node@v4
diff --git a/.github/workflows/docs-last-changed.yml b/.github/workflows/docs-last-changed.yml
index d8d88c53af5..94967a403f2 100644
--- a/.github/workflows/docs-last-changed.yml
+++ b/.github/workflows/docs-last-changed.yml
@@ -29,7 +29,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Setup node
diff --git a/.github/workflows/docs-mgmt-api-update.yml b/.github/workflows/docs-mgmt-api-update.yml
index 47508dc49c2..f395be7acad 100644
--- a/.github/workflows/docs-mgmt-api-update.yml
+++ b/.github/workflows/docs-mgmt-api-update.yml
@@ -20,7 +20,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.github/workflows/docs-tests-smoke.yml b/.github/workflows/docs-tests-smoke.yml
index 930406127c1..c5a38916a46 100644
--- a/.github/workflows/docs-tests-smoke.yml
+++ b/.github/workflows/docs-tests-smoke.yml
@@ -25,7 +25,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.github/workflows/docs-tests.yml b/.github/workflows/docs-tests.yml
index e1de7081e50..f9a36f3cf20 100644
--- a/.github/workflows/docs-tests.yml
+++ b/.github/workflows/docs-tests.yml
@@ -26,7 +26,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.github/workflows/local-studio-tests.yml b/.github/workflows/local-studio-tests.yml
index 9c64715b1e0..24ccc70cce5 100644
--- a/.github/workflows/local-studio-tests.yml
+++ b/.github/workflows/local-studio-tests.yml
@@ -28,7 +28,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Use Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
index 0886ee2337a..9381cd0e98e 100644
--- a/.github/workflows/prettier.yml
+++ b/.github/workflows/prettier.yml
@@ -21,7 +21,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Setup node
         uses: actions/setup-node@v4
@@ -47,7 +46,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Setup node
         uses: actions/setup-node@v4
@@ -73,7 +71,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Setup node
         uses: actions/setup-node@v4
diff --git a/.github/workflows/search.yml b/.github/workflows/search.yml
index 70148e80480..60385047ea4 100644
--- a/.github/workflows/search.yml
+++ b/.github/workflows/search.yml
@@ -41,7 +41,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Setup node
diff --git a/.github/workflows/studio-tests.yml b/.github/workflows/studio-tests.yml
index 7390691e03d..0f41b9e49cf 100644
--- a/.github/workflows/studio-tests.yml
+++ b/.github/workflows/studio-tests.yml
@@ -34,7 +34,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
       - name: Use Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 42e5e2c0cb5..76e474371a1 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -22,7 +22,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.github/workflows/ui-patterns-tests.yml b/.github/workflows/ui-patterns-tests.yml
index 2209729286c..1f5b93696d8 100644
--- a/.github/workflows/ui-patterns-tests.yml
+++ b/.github/workflows/ui-patterns-tests.yml
@@ -24,7 +24,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index ba4861cfb9b..80b75b974cd 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -24,7 +24,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.10.0
           run_install: false
 
       - name: Use Node.js
diff --git a/.npmrc b/.npmrc
index 4fd021952d5..a4047535344 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
-engine-strict=true
\ No newline at end of file
+engine-strict=true
+update-notifier=false
diff --git a/apps/studio/Dockerfile b/apps/studio/Dockerfile
index 23dfdc12c5b..586be9e9177 100644
--- a/apps/studio/Dockerfile
+++ b/apps/studio/Dockerfile
@@ -11,7 +11,6 @@
 FROM node:20-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
 
 # Fixes issues with Sentry CLI and SSL certificates during build
 # TODO: Git is added because it's needed to build libpg, remove it once they publish a binary on the S3 bucket
@@ -24,6 +23,8 @@ RUN apt-get update -qq && \
   rm -rf /var/lib/apt/lists/* && \
   update-ca-certificates
 
+RUN npm install -g pnpm@9.15.5
+
 WORKDIR /app
 
 # Prune unneeded dependencies with turbo (from apps/ for example)
diff --git a/package.json b/package.json
index 79ad24c9290..b088280717b 100644
--- a/package.json
+++ b/package.json
@@ -55,9 +55,9 @@
     }
   },
   "engines": {
-    "pnpm": "^9.0.0",
-    "node": ">= 20"
+    "pnpm": ">=9",
+    "node": ">=20"
   },
   "keywords": ["postgres", "firebase", "storage", "functions", "database", "auth"],
-  "packageManager": "pnpm@9.10.0"
+  "packageManager": "pnpm@9.15.5"
 }