diff --git a/.github/actions/pnpm-setup/action.yml b/.github/actions/pnpm-setup/action.yml
index 2355da8ef..560858255 100644
--- a/.github/actions/pnpm-setup/action.yml
+++ b/.github/actions/pnpm-setup/action.yml
@@ -12,8 +12,6 @@ runs:
 
     # Install pnpm. https://github.com/pnpm/action-setup
     - uses: pnpm/action-setup@v4
-      with:
-        version: 9
         # run_install: false
 
     # Get pnpm store path so we can cache it
diff --git a/package.json b/package.json
index 84d29c860..5c2bb6762 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,11 @@
     "@changesets/changelog-github": "^0.4.4",
     "@changesets/cli": "^2.22.0",
     "pkg-pr-new": "^0.0.29",
-    "turbo": "1.10.12"
+    "turbo": "catalog:"
   },
   "engines": {
     "node": ">=18",
     "pnpm": ">=9"
-  }
+  },
+  "packageManager": "pnpm@9.15.9"
 }
diff --git a/packages/tests-e2e/package.json b/packages/tests-e2e/package.json
index 328c02b4f..cb423950d 100644
--- a/packages/tests-e2e/package.json
+++ b/packages/tests-e2e/package.json
@@ -11,6 +11,5 @@
     "@playwright/test": "1.49.1",
     "start-server-and-test": "2.0.0",
     "ts-node": "10.9.1"
-  },
-  "version": null
+  }
 }
diff --git a/packages/tests-unit/package.json b/packages/tests-unit/package.json
index 1aca6057c..e7a4ef6a4 100644
--- a/packages/tests-unit/package.json
+++ b/packages/tests-unit/package.json
@@ -17,6 +17,5 @@
     "vite": "5.4.9",
     "vite-tsconfig-paths": "^5.0.1",
     "vitest": "^2.1.3"
-  },
-  "version": null
+  }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba7bc9201..3c8745a47 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,6 +36,9 @@ catalogs:
     tailwindcss:
       specifier: 3.3.3
       version: 3.3.3
+    turbo:
+      specifier: 2.5.3
+      version: 2.5.3
     typescript:
       specifier: 5.6.3
       version: 5.6.3
@@ -57,8 +60,8 @@ importers:
         specifier: ^0.0.29
         version: 0.0.29
       turbo:
-        specifier: 1.10.12
-        version: 1.10.12
+        specifier: 'catalog:'
+        version: 2.5.3
 
   examples/app-pages-router:
     dependencies:
@@ -5380,38 +5383,38 @@ packages:
       typescript:
         optional: true
 
-  turbo-darwin-64@1.10.12:
-    resolution: {integrity: sha512-vmDfGVPl5/aFenAbOj3eOx3ePNcWVUyZwYr7taRl0ZBbmv2TzjRiFotO4vrKCiTVnbqjQqAFQWY2ugbqCI1kOQ==}
+  turbo-darwin-64@2.5.3:
+    resolution: {integrity: sha512-YSItEVBUIvAGPUDpAB9etEmSqZI3T6BHrkBkeSErvICXn3dfqXUfeLx35LfptLDEbrzFUdwYFNmt8QXOwe9yaw==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@1.10.12:
-    resolution: {integrity: sha512-3JliEESLNX2s7g54SOBqqkqJ7UhcOGkS0ywMr5SNuvF6kWVTbuUq7uBU/sVbGq8RwvK1ONlhPvJne5MUqBCTCQ==}
+  turbo-darwin-arm64@2.5.3:
+    resolution: {integrity: sha512-5PefrwHd42UiZX7YA9m1LPW6x9YJBDErXmsegCkVp+GjmWrADfEOxpFrGQNonH3ZMj77WZB2PVE5Aw3gA+IOhg==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@1.10.12:
-    resolution: {integrity: sha512-siYhgeX0DidIfHSgCR95b8xPee9enKSOjCzx7EjTLmPqPaCiVebRYvbOIYdQWRqiaKh9yfhUtFmtMOMScUf1gg==}
+  turbo-linux-64@2.5.3:
+    resolution: {integrity: sha512-M9xigFgawn5ofTmRzvjjLj3Lqc05O8VHKuOlWNUlnHPUltFquyEeSkpQNkE/vpPdOR14AzxqHbhhxtfS4qvb1w==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@1.10.12:
-    resolution: {integrity: sha512-K/ZhvD9l4SslclaMkTiIrnfcACgos79YcAo4kwc8bnMQaKuUeRpM15sxLpZp3xDjDg8EY93vsKyjaOhdFG2UbA==}
+  turbo-linux-arm64@2.5.3:
+    resolution: {integrity: sha512-auJRbYZ8SGJVqvzTikpg1bsRAsiI9Tk0/SDkA5Xgg0GdiHDH/BOzv1ZjDE2mjmlrO/obr19Dw+39OlMhwLffrw==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@1.10.12:
-    resolution: {integrity: sha512-7FSgSwvktWDNOqV65l9AbZwcoueAILeE4L7JvjauNASAjjbuzXGCEq5uN8AQU3U5BOFj4TdXrVmO2dX+lLu8Zg==}
+  turbo-windows-64@2.5.3:
+    resolution: {integrity: sha512-arLQYohuHtIEKkmQSCU9vtrKUg+/1TTstWB9VYRSsz+khvg81eX6LYHtXJfH/dK7Ho6ck+JaEh5G+QrE1jEmCQ==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@1.10.12:
-    resolution: {integrity: sha512-gCNXF52dwom1HLY9ry/cneBPOKTBHhzpqhMylcyvJP0vp9zeMQQkt6yjYv+6QdnmELC92CtKNp2FsNZo+z0pyw==}
+  turbo-windows-arm64@2.5.3:
+    resolution: {integrity: sha512-3JPn66HAynJ0gtr6H+hjY4VHpu1RPKcEwGATvGUTmLmYSYBQieVlnGDRMMoYN066YfyPqnNGCfhYbXfH92Cm0g==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@1.10.12:
-    resolution: {integrity: sha512-WM3+jTfQWnB9W208pmP4oeehZcC6JQNlydb/ZHMRrhmQa+htGhWLCzd6Q9rLe0MwZLPpSPFV2/bN5egCLyoKjQ==}
+  turbo@2.5.3:
+    resolution: {integrity: sha512-iHuaNcq5GZZnr3XDZNuu2LSyCzAOPwDuo5Qt+q64DfsTP1i3T2bKfxJhni2ZQxsvAoxRbuUK5QetJki4qc5aYA==}
     hasBin: true
 
   type-detect@4.1.0:
@@ -12394,32 +12397,32 @@ snapshots:
       - supports-color
       - ts-node
 
-  turbo-darwin-64@1.10.12:
+  turbo-darwin-64@2.5.3:
     optional: true
 
-  turbo-darwin-arm64@1.10.12:
+  turbo-darwin-arm64@2.5.3:
     optional: true
 
-  turbo-linux-64@1.10.12:
+  turbo-linux-64@2.5.3:
     optional: true
 
-  turbo-linux-arm64@1.10.12:
+  turbo-linux-arm64@2.5.3:
     optional: true
 
-  turbo-windows-64@1.10.12:
+  turbo-windows-64@2.5.3:
     optional: true
 
-  turbo-windows-arm64@1.10.12:
+  turbo-windows-arm64@2.5.3:
     optional: true
 
-  turbo@1.10.12:
+  turbo@2.5.3:
     optionalDependencies:
-      turbo-darwin-64: 1.10.12
-      turbo-darwin-arm64: 1.10.12
-      turbo-linux-64: 1.10.12
-      turbo-linux-arm64: 1.10.12
-      turbo-windows-64: 1.10.12
-      turbo-windows-arm64: 1.10.12
+      turbo-darwin-64: 2.5.3
+      turbo-darwin-arm64: 2.5.3
+      turbo-linux-64: 2.5.3
+      turbo-linux-arm64: 2.5.3
+      turbo-windows-64: 2.5.3
+      turbo-windows-arm64: 2.5.3
 
   type-detect@4.1.0: {}
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 6b10e0787..1a804fdc0 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -14,3 +14,4 @@ catalog:
   tailwindcss: 3.3.3
   typescript: 5.6.3
   esbuild: 0.25.4
+  turbo: 2.5.3
diff --git a/turbo.json b/turbo.json
index 89e49c58a..6ad0a1892 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "globalEnv": ["APP_ROUTER_URL", "PAGES_ROUTER_URL", "APP_PAGES_ROUTER_URL"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": ["dist/**"]