diff --git a/.changeset/witty-papayas-cover.md b/.changeset/witty-papayas-cover.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/witty-papayas-cover.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.env.local.example b/.env.local.example
index cb2f93f0f9..1322b38b9d 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -6,7 +6,10 @@
 # ============================================================================
 
 # Server port (default: 3000)
+# Note: In Conductor workspaces, CONDUCTOR_PORT is automatically assigned during setup
+# and overrides this value. Mintlify docs use CONDUCTOR_PORT + 1.
 PORT=3000
+# CONDUCTOR_PORT=<auto-assigned-port>
 
 # Environment: development | production
 NODE_ENV=development
@@ -24,8 +27,9 @@ LOG_LEVEL=debug
 
 # PostgreSQL connection string (REQUIRED)
 # Format: postgresql://username:password@host:port/database
+# Note: Port is automatically assigned by Docker and written to .env.local during setup
 # Example for local development:
-DATABASE_URL=postgresql://adcp:localdev@localhost:5433/adcp_registry
+DATABASE_URL=postgresql://adcp:localdev@localhost:<auto-assigned-port>/adcp_registry
 
 # Enable SSL for database connection (default: false)
 DATABASE_SSL=false
diff --git a/conductor.json b/conductor.json
index a6ae1b5370..a3b2a9d517 100644
--- a/conductor.json
+++ b/conductor.json
@@ -7,6 +7,6 @@
     }
   ],
   "scripts": {
-    "setup": "git config core.hooksPath .husky\nnpm install\nuv sync\ndocker compose up -d postgres\nnpm run db:migrate"
+    "setup": "git config core.hooksPath .husky && npm install && uv sync && docker compose up -d postgres && sleep 2 && DB_PORT=$(docker compose port postgres 5432 | cut -d: -f2) && APP_PORT=$((50000 + RANDOM % 10000)) && echo \"DATABASE_URL=postgresql://adcp:localdev@localhost:$DB_PORT/adcp_registry\" >> .env.local && echo \"DATABASE_SSL=false\" >> .env.local && echo \"CONDUCTOR_PORT=$APP_PORT\" >> .env.local && npm run db:migrate"
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 728ccdf913..12d4a9cea1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       POSTGRES_USER: adcp
       POSTGRES_PASSWORD: localdev
     ports:
-      - "5433:5432"
+      - "5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
diff --git a/package.json b/package.json
index bf449c2ead..ae9dc82c1a 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
     "start": "DOTENV_CONFIG_PATH=.env.local tsx watch server/src/index.ts",
     "start:mcp": "DOTENV_CONFIG_PATH=.env.local MODE=mcp tsx watch server/src/index.ts",
     "start:mintlify": "bash scripts/start-mintlify.sh",
-    "start:stripe": "stripe listen --forward-to localhost:3000/api/webhooks/stripe",
-    "dev": "DOTENV_CONFIG_PATH=.env.local CONDUCTOR_PORT=55020 concurrently --names \"HTTP,DOCS,STRIPE\" -c \"bgBlue.bold,bgGreen.bold,bgMagenta.bold\" \"npm run start\" \"npm run start:mintlify\" \"npm run start:stripe\"",
-    "db:migrate": "DOTENV_CONFIG_PATH=.env.local tsx server/src/db/migrate.ts",
+    "start:stripe": "bash -c 'source <(grep CONDUCTOR_PORT .env.local | sed \"s/^/export /\") && PORT=${CONDUCTOR_PORT:-3000} && stripe listen --forward-to localhost:$PORT/api/webhooks/stripe'",
+    "dev": "bash -c 'source <(grep CONDUCTOR_PORT .env.local | sed \"s/^/export /\") && DOTENV_CONFIG_PATH=.env.local concurrently --names \"HTTP,DOCS,STRIPE\" -c \"bgBlue.bold,bgGreen.bold,bgMagenta.bold\" \"npm run start\" \"npm run start:mintlify\" \"npm run start:stripe\"'",
+    "db:migrate": "DOTENV_CONFIG_PATH=.env.local tsx --import dotenv/config server/src/db/migrate.ts",
     "db:seed": "DOTENV_CONFIG_PATH=.env.local tsx server/src/db/seed-registry.ts",
     "build": "tsc --project server/tsconfig.json && npm run build:schemas",
     "build:schemas": "node scripts/build-schemas.js",