diff --git a/packages/app/control/package.json b/packages/app/control/package.json
index 2c6f21f32..a281eaf29 100644
--- a/packages/app/control/package.json
+++ b/packages/app/control/package.json
@@ -14,12 +14,12 @@
     "setup-webhook": "node scripts/setup-webhook.js",
     "test": "echo 'All tests passed!'",
     "test:unit": "echo 'All tests passed!'",
-    "prisma:generate": "pnpx prisma generate",
-    "prisma:push": "pnpx prisma db push",
-    "prisma:studio": "pnpx prisma studio",
-    "prisma:reset": "pnpx prisma migrate reset",
-    "prisma:migrate-dev": "pnpx prisma migrate dev",
-    "prisma:migrate-deploy": "pnpx prisma migrate deploy",
+    "prisma:generate": "pnpm exec prisma generate",
+    "prisma:push": "pnpm exec prisma db push",
+    "prisma:studio": "pnpm exec prisma studio",
+    "prisma:reset": "pnpm exec prisma migrate reset",
+    "prisma:migrate-dev": "pnpm exec prisma migrate dev",
+    "prisma:migrate-deploy": "pnpm exec prisma migrate deploy",
     "check-types": "next typegen && tsc --noEmit",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"",
diff --git a/packages/app/control/scripts/migrate-drop-staging-db.sh b/packages/app/control/scripts/migrate-drop-staging-db.sh
index 645d1d005..3de221ec3 100755
--- a/packages/app/control/scripts/migrate-drop-staging-db.sh
+++ b/packages/app/control/scripts/migrate-drop-staging-db.sh
@@ -54,11 +54,11 @@ echo ""
 
 # Reset the database (drops all data and schema)
 echo "📥 Resetting database..."
-pnpx prisma db push --force-reset --accept-data-loss
+pnpm exec prisma db push --force-reset --accept-data-loss
 
 # Generate Prisma client
 echo "🔧 Generating Prisma client..."
-pnpx prisma generate
+pnpm exec prisma generate
 
 echo ""
 echo "✅ Database migration completed successfully!"
@@ -66,5 +66,5 @@ echo "📊 The staging database has been reset and the current schema has been a
 echo ""
 echo "You can now:"
 echo "  - Run your application against the fresh staging database"
-echo "  - Use 'pnpx prisma studio' to view the database"
+echo "  - Use 'pnpm exec prisma studio' to view the database"
 echo "  - Seed the database with test data if needed"
diff --git a/packages/app/control/scripts/migrate-production-db.sh b/packages/app/control/scripts/migrate-production-db.sh
index 8ecdd640a..0bcf27723 100755
--- a/packages/app/control/scripts/migrate-production-db.sh
+++ b/packages/app/control/scripts/migrate-production-db.sh
@@ -56,18 +56,18 @@ echo ""
 
 # Check migration status first
 echo "📋 Checking current migration status..."
-pnpx prisma migrate status
+pnpm exec prisma migrate status
 
 echo ""
 echo "🔄 Applying pending migrations..."
 
 # Apply migrations (this is safe - it only applies new migrations)
-pnpx prisma migrate deploy
+pnpm exec prisma migrate deploy
 
 # Generate Prisma client to ensure it's up to date
 echo ""
 echo "🔧 Generating Prisma client..."
-pnpx prisma generate
+pnpm exec prisma generate
 
 echo ""
 echo "✅ Production database migration completed successfully!"
@@ -76,11 +76,11 @@ echo ""
 
 # Show final migration status
 echo "📋 Final migration status:"
-pnpx prisma migrate status
+pnpm exec prisma migrate status
 
 echo ""
 echo "🎉 Production database is now up to date!"
 echo "You can verify the changes by:"
 echo "  - Checking your application logs"
 echo "  - Running health checks on your production application"
-echo "  - Using 'pnpx prisma studio' (with production credentials) to inspect the database"
+echo "  - Using 'pnpm exec prisma studio' (with production credentials) to inspect the database"
diff --git a/packages/app/control/setup-db.sh b/packages/app/control/setup-db.sh
index 8f24ce09c..1989a4312 100755
--- a/packages/app/control/setup-db.sh
+++ b/packages/app/control/setup-db.sh
@@ -40,13 +40,13 @@ fi
 
 # Run Prisma migrations
 echo "🔄 Running Prisma migrations..."
-npx prisma generate
-npx prisma db push
+pnpm exec prisma generate
+pnpm exec prisma db push
 
 echo "🎉 Database setup complete!"
 echo ""
 echo "📊 You can now run:"
 echo "  npm run dev          # Start the application"
-echo "  npx prisma studio    # View the database"
+echo "  pnpm exec prisma studio    # View the database"
 echo "  docker logs local-postgres  # View database logs"
 echo "  docker stop local-postgres  # Stop the database"
\ No newline at end of file
diff --git a/packages/app/server/package.json b/packages/app/server/package.json
index a08ca04df..c13b2d2b5 100644
--- a/packages/app/server/package.json
+++ b/packages/app/server/package.json
@@ -5,7 +5,7 @@
   "main": "dist/server.js",
   "scripts": {
     "copy-schema": "mkdir -p prisma && cp ../control/prisma/schema.prisma prisma/ && cp -r ../control/prisma/migrations prisma/",
-    "prisma:generate": "pnpx prisma generate",
+    "prisma:generate": "pnpm exec prisma generate",
     "setup-prisma": "pnpm run copy-schema && pnpm run prisma:generate",
     "copy-prisma": "pnpm run setup-prisma",
     "copy-prisma-to-dist": "mkdir -p dist/generated && cp -r src/generated/prisma dist/generated/",
@@ -14,7 +14,7 @@
     "prestart": "pnpm run copy-prisma",
     "dev": "pnpm run build && node dist/server.js",
     "start": "node dist/server.js",
-    "prisma:migrate-deploy": "pnpx prisma migrate deploy",
+    "prisma:migrate-deploy": "pnpm exec prisma migrate deploy",
     "anthropic-client": "npx tsx src/clients/anthropic-client.ts",
     "anthropic-gpt-client": "npx tsx src/clients/anthropic-gpt-client.ts",
     "gemini-client": "npx tsx src/clients/gemini-client.ts",