diff --git a/.github/workflows/e2e-api-tests.yaml b/.github/workflows/e2e-api-tests.yaml
index 0d9608007..b023a96af 100644
--- a/.github/workflows/e2e-api-tests.yaml
+++ b/.github/workflows/e2e-api-tests.yaml
@@ -89,10 +89,10 @@ jobs:
         run: pnpm run wait-until-postgres-is-ready:pg_isready
 
       - name: Wait on Inbucket
-        run: npx wait-on tcp:localhost:8129
+        run: pnpx wait-on tcp:localhost:8129
 
       - name: Wait on Svix
-        run: npx wait-on tcp:localhost:8113
+        run: pnpx wait-on tcp:localhost:8113
 
       - name: Initialize database
         run: pnpm run db:init
diff --git a/.github/workflows/e2e-custom-base-port-api-tests.yaml b/.github/workflows/e2e-custom-base-port-api-tests.yaml
index 43b72508b..6889b42cc 100644
--- a/.github/workflows/e2e-custom-base-port-api-tests.yaml
+++ b/.github/workflows/e2e-custom-base-port-api-tests.yaml
@@ -90,10 +90,10 @@ jobs:
         run: pnpm run wait-until-postgres-is-ready:pg_isready
 
       - name: Wait on Inbucket
-        run: npx wait-on tcp:localhost:6729
+        run: pnpx wait-on tcp:localhost:6729
 
       - name: Wait on Svix
-        run: npx wait-on tcp:localhost:6713
+        run: pnpx wait-on tcp:localhost:6713
 
       - name: Initialize database
         run: pnpm run db:init
diff --git a/.github/workflows/e2e-source-of-truth-api-tests.yaml b/.github/workflows/e2e-source-of-truth-api-tests.yaml
index aa3d5b3ff..b2927d5a1 100644
--- a/.github/workflows/e2e-source-of-truth-api-tests.yaml
+++ b/.github/workflows/e2e-source-of-truth-api-tests.yaml
@@ -91,10 +91,10 @@ jobs:
         run: pnpm run wait-until-postgres-is-ready:pg_isready
 
       - name: Wait on Inbucket
-        run: npx wait-on tcp:localhost:8129
+        run: pnpx wait-on tcp:localhost:8129
 
       - name: Wait on Svix
-        run: npx wait-on tcp:localhost:8113
+        run: pnpx wait-on tcp:localhost:8113
 
       - name: Create source-of-truth database and schema
         run: |
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
index b6388f146..93c1fe77b 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
@@ -55,10 +55,10 @@ export default function SetupPage(props: { toMetrics: () => void }) {
         </Typography>
         <CodeBlock
           language="bash"
-          content={`npx @stackframe/init-stack@latest`}
+          content={`pnpx @stackframe/init-stack@latest`}
           customRender={
             <div className="p-4 font-mono text-sm">
-              <span className={commandClasses}>npx</span> <span className={nameClasses}>@stackframe/init-stack@latest</span>
+              <span className={commandClasses}>pnpx</span> <span className={nameClasses}>@stackframe/init-stack@latest</span>
             </div>
           }
           title="Terminal"
diff --git a/apps/dev-launchpad/public/index.html b/apps/dev-launchpad/public/index.html
index 8890d533f..276740c75 100644
--- a/apps/dev-launchpad/public/index.html
+++ b/apps/dev-launchpad/public/index.html
@@ -300,14 +300,6 @@
             "React example",
           ],
         },
-        {
-          name: "MCPJam Inspector",
-          portSuffix: "26",
-          importance: 1,
-          description: [
-            "MCP tool inspector",
-          ],
-        },
         {
           name: "Convex example",
           portSuffix: "27",
diff --git a/docker/dependencies/docker.compose.yaml b/docker/dependencies/docker.compose.yaml
index 0d3800318..ec92768d5 100644
--- a/docker/dependencies/docker.compose.yaml
+++ b/docker/dependencies/docker.compose.yaml
@@ -204,22 +204,6 @@ services:
     environment:
       HOST_ON_HOST: host.docker.internal
 
-  # ================= MCPJam Inspector =================
-
-  mcpjam-inspector:
-    image: node:20-alpine
-    ports:
-      - "${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}26:3001"
-    command: >
-      sh -c "echo '{\"mcpServers\":{\"local-stack-auth-docs\":{\"url\":\"http://host.docker.internal:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}04/api/internal/mcp\"}}}' > /app/mcp.json && npx -y @mcpjam/inspector@latest --port 3001 --config /app/mcp.json"
-    working_dir: /app
-    volumes:
-      - mcpjam-inspector-data:/root
-    extra_hosts:
-      - "host.docker.internal:host-gateway"  # noop on Docker Desktop/Orbstack, enables host.docker.internal on Linux
-    environment:
-      HOST_ON_HOST: host.docker.internal
-
 
 # ================= volumes =================
 
@@ -231,7 +215,6 @@ volumes:
   s3mock-data:
   deno-cache:
   localstack-data:
-  mcpjam-inspector-data:
 
 # ================= configs =================
 
diff --git a/package.json b/package.json
index 05e1b7a7d..5e1e363fa 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "repository": "",
   "scripts": {
-    "pre-no-codegen": "npx -y only-allow pnpm",
-    "pre-preinstall": "npx -y only-allow pnpm && node -e \"if(process.env.STACK_SKIP_TEMPLATE_GENERATION !== 'true') require('child_process').execSync('npx --package=tsx tsx ./scripts/generate-sdks.ts', {stdio: 'inherit'})\"",
+    "pre-no-codegen": "pnpx -y only-allow pnpm",
+    "pre-preinstall": "pnpx -y only-allow pnpm && node -e \"if(process.env.STACK_SKIP_TEMPLATE_GENERATION !== 'true') require('child_process').execSync('pnpx --package=tsx tsx ./scripts/generate-sdks.ts', {stdio: 'inherit'})\"",
     "pre": "pnpm pre-preinstall",
     "preinstall": "pnpm pre-preinstall",
     "typecheck": "pnpm pre && turbo typecheck --",
@@ -16,10 +16,10 @@
     "build:demo": "pnpm pre && turbo run build --filter=demo-app...",
     "build:docs": "pnpm run build:packages && pnpm run build:backend && turbo run generate-openapi-fumadocs && pnpm run --filter=@stackframe/stack-docs generate-openapi-docs && turbo run build --filter=@stackframe/stack-docs",
     "build:packages": "pnpm pre && turbo run build --filter=./packages/*",
-    "claude-code": "pnpm pre && npx -y @anthropic-ai/claude-code@latest",
-    "cmux": "pnpm pre && npx -y cmux@latest",
-    "codebuff": "pnpm pre && npx codebuff",
-    "restart-dev-in-background": "pnpm pre && pnpm run kill-dev:named && (pnpm run dev:named > dev-server.log.untracked.txt 2>&1 &) && echo 'Starting dev server in background... (Logs are in dev-server.log.untracked.txt)' && npx wait-on http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}02 -t 120000 && echo 'Dev server running.'",
+    "claude-code": "pnpm pre && pnpx -y @anthropic-ai/claude-code@latest",
+    "cmux": "pnpm pre && pnpx -y cmux@latest",
+    "codebuff": "pnpm pre && pnpx codebuff",
+    "restart-dev-in-background": "pnpm pre && pnpm run kill-dev:named && (pnpm run dev:named > dev-server.log.untracked.txt 2>&1 &) && echo 'Starting dev server in background... (Logs are in dev-server.log.untracked.txt)' && pnpx wait-on http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}02 -t 120000 && echo 'Dev server running.'",
     "restart-dev-environment": "pnpm pre && concurrently \"pnpm run build:packages && pnpm run codegen\" \"pnpm run restart-deps\" && pnpm run restart-dev-in-background",
     "stop-dev-environment": "pnpm pre && pnpm run kill-dev:named && pnpm run stop-deps",
     "clean": "pnpm pre-no-codegen && turbo run clean && rimraf --glob **/.next && rimraf --glob **/.turbo && rimraf .turbo && rimraf --glob **/node_modules",
@@ -60,7 +60,7 @@
     "verify-data-integrity": "pnpm pre && pnpm -C apps/backend run verify-data-integrity",
     "generate-openapi-fumadocs": "turbo run generate-openapi-fumadocs",
     "generate-keys": "pnpm pre && turbo run generate-keys",
-    "generate-sdks": "npx --package=tsx tsx ./scripts/generate-sdks.ts",
+    "generate-sdks": "pnpx --package=tsx tsx ./scripts/generate-sdks.ts",
     "generate-sdks:watch": "chokidar --silent -c 'pnpm run generate-sdks' './packages/template' --ignore './packages/template/package.json' --ignore '**/node_modules/**' --ignore '**/dist/**' --ignore '**/.turbo/**' --throttle 2000",
     "generate-openapi-docs:watch": "chokidar --silent -c 'pnpm run --filter=@stackframe/stack-docs generate-openapi-docs' './docs/public/openapi/{admin,client,server,webhooks}.json' --throttle 2000"
   },
diff --git a/packages/init-stack/package.json b/packages/init-stack/package.json
index a26045820..bd21b84be 100644
--- a/packages/init-stack/package.json
+++ b/packages/init-stack/package.json
@@ -21,14 +21,14 @@
     "test-run-no-browser": "rimraf test-run-output && mkdir test-run-output && cd test-run-output && npm init --init-author-name example-author --init-license UNLICENSED --init-author-url http://example.com --init-module test-run-output --init-version 1.0.0 -y && cd .. && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --server --npm --no-browser",
     "test-run-node:manual": "rimraf test-run-output && mkdir test-run-output && cd test-run-output && npm init && cd .. && pnpm run init-stack:local test-run-output",
     "test-run-node": "rimraf test-run-output && mkdir test-run-output && cd test-run-output && npm init --init-author-name example-author --init-license UNLICENSED --init-author-url http://example.com --init-module test-run-output --init-version 1.0.0 -y && cd .. && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --server --npm --no-browser",
-    "test-run-js:manual": "rimraf test-run-output && npx -y sv create test-run-output --no-install && pnpm run init-stack:local test-run-output",
-    "test-run-js": "rimraf test-run-output && npx -y sv create test-run-output --template minimal --types ts --no-add-ons --no-install && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --client --npm --no-browser",
-    "test-run-next:manual": "rimraf test-run-output && npx -y create-next-app@latest test-run-output && pnpm run init-stack:local test-run-output",
-    "test-run-next": "rimraf test-run-output && npx -y create-next-app@latest test-run-output --app --ts --no-src-dir --tailwind --use-npm --eslint --import-alias '##@#/*' --turbopack && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --no-browser",
-    "test-run-keys-next": "rimraf test-run-output && npx -y create-next-app@latest test-run-output --app --ts --no-src-dir --tailwind --use-npm --eslint --import-alias '##@#/*' --turbopack && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --project-id my-project-id --publishable-client-key my-publishable-client-key",
-    "test-run-keys-js": "rimraf test-run-output && npx -y sv create test-run-output --template minimal --types ts --no-add-ons --no-install && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --client --npm --project-id my-project-id --publishable-client-key my-publishable-client-key",
-    "test-run-react": "rimraf test-run-output && npx -y create-vite@latest test-run-output --template react-ts && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --no-browser --npm",
-    "test-run-react:manual": "rimraf test-run-output && npx -y create-vite@latest test-run-output --template react-ts && pnpm run init-stack:local test-run-output --react"
+    "test-run-js:manual": "rimraf test-run-output && pnpx -y sv create test-run-output --no-install && pnpm run init-stack:local test-run-output",
+    "test-run-js": "rimraf test-run-output && pnpx -y sv create test-run-output --template minimal --types ts --no-add-ons --no-install && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --client --npm --no-browser",
+    "test-run-next:manual": "rimraf test-run-output && pnpx -y create-next-app@latest test-run-output && pnpm run init-stack:local test-run-output",
+    "test-run-next": "rimraf test-run-output && pnpx -y create-next-app@latest test-run-output --app --ts --no-src-dir --tailwind --use-npm --eslint --import-alias '##@#/*' --turbopack && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --no-browser",
+    "test-run-keys-next": "rimraf test-run-output && pnpx -y create-next-app@latest test-run-output --app --ts --no-src-dir --tailwind --use-npm --eslint --import-alias '##@#/*' --turbopack && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --project-id my-project-id --publishable-client-key my-publishable-client-key",
+    "test-run-keys-js": "rimraf test-run-output && pnpx -y sv create test-run-output --template minimal --types ts --no-add-ons --no-install && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --js --client --npm --project-id my-project-id --publishable-client-key my-publishable-client-key",
+    "test-run-react": "rimraf test-run-output && pnpx -y create-vite@latest test-run-output --template react-ts && pnpm run init-stack:local test-run-output --on-question error --no-warn-uncommitted-changes --no-browser --npm",
+    "test-run-react:manual": "rimraf test-run-output && pnpx -y create-vite@latest test-run-output --template react-ts && pnpm run init-stack:local test-run-output --react"
   },
   "files": [
     "README.md",