diff --git a/.github/workflows/publish-mcp.yml b/.github/workflows/publish-mcp.yml
index 88147b18..ac872f49 100644
--- a/.github/workflows/publish-mcp.yml
+++ b/.github/workflows/publish-mcp.yml
@@ -32,7 +32,7 @@ jobs:
         run: pnpm install --no-frozen-lockfile
 
       - name: Build publishable MCP package
-        run: pnpm --filter @classroomio/mcp build
+        run: pnpm mcp:build
 
       - name: Publish package
         if: github.event_name == 'workflow_dispatch'
diff --git a/package.json b/package.json
index de276114..01ae6fff 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "dashboard:dev": "pnpm dev --filter=@cio/dashboard --filter=@cio/ui --filter=@cio/question-types --filter=@cio/db --filter=@cio/utils",
     "api:dev": "pnpm dev --filter=@cio/api --filter=@cio/email --filter=@cio/db --filter=@cio/utils",
     "website:dev": "pnpm dev --filter=@cio/website",
-    "storybook:dev": "pnpm dev --filter=@cio/storybook --filter=@cio/ui --filter=@cio/question-types"
+    "storybook:dev": "pnpm dev --filter=@cio/storybook --filter=@cio/ui --filter=@cio/question-types",
+    "mcp:build": "pnpm build --filter=@classroomio/mcp"
   },
   "license": "MIT",
   "dependencies": {
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index 0a67d903..8a954efa 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -14,7 +14,7 @@
     "classroomio-mcp": "./dist/index.js"
   },
   "scripts": {
-    "build": "pnpm -C ../utils build && tsc --noEmit && rm -rf dist tsconfig.tsbuildinfo && node ./scripts/build.mjs",
+    "build": "tsc --noEmit && rm -rf dist tsconfig.tsbuildinfo && node ./scripts/build.mjs",
     "dev": "tsx src/index.ts",
     "start": "node dist/index.js"
   },
diff --git a/packages/mcp/src/config.ts b/packages/mcp/src/config.ts
index 0c69fd0f..54686c3b 100644
--- a/packages/mcp/src/config.ts
+++ b/packages/mcp/src/config.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 const ZConfig = z.object({
-  CLASSROOMIO_API_URL: z.string().url(),
+  CLASSROOMIO_API_URL: z.url().default('https://api.classroomio.com'),
   CLASSROOMIO_API_KEY: z.string().min(1),
   CLASSROOMIO_USER_AGENT: z.string().min(1).default('classroomio-mcp/0.0.1')
 });