diff --git a/apps/generator/src/lib/deploy.ts b/apps/generator/src/lib/deploy.ts
index 8515b36..d7fa4ad 100644
--- a/apps/generator/src/lib/deploy.ts
+++ b/apps/generator/src/lib/deploy.ts
@@ -52,7 +52,7 @@ async function removeRunnerMapEntry(slug: string): Promise<void> {
   }
 }
 
-function computePublicUrl(slug: string, port: number): string {
+export function computePublicUrl(slug: string, port: number): string {
   if (config.MCP_DOMAIN) return `https://${config.MCP_DOMAIN}/${slug}`;
   return `http://${config.RUNNER_HOST}:${port}`;
 }
diff --git a/apps/generator/src/worker.ts b/apps/generator/src/worker.ts
index fd30f6f..32ff836 100644
--- a/apps/generator/src/worker.ts
+++ b/apps/generator/src/worker.ts
@@ -5,7 +5,13 @@ import { Redis } from 'ioredis';
 import { config } from './config.js';
 import { dockerBuild, prepareBuildContext, staticCheck } from './lib/build.js';
 import { generateSpec } from './lib/claude.js';
-import { allocatePort, deployContainer, dockerAvailable, stopContainer } from './lib/deploy.js';
+import {
+  allocatePort,
+  computePublicUrl,
+  deployContainer,
+  dockerAvailable,
+  stopContainer,
+} from './lib/deploy.js';
 import { emitDone, emitError, emitLog, emitStatus } from './lib/emit.js';
 import { renderServerCode } from './lib/render.js';
 
@@ -156,7 +162,13 @@ export const worker = new Worker<JobData>(
       await emitStatus(buildId, 'deploying');
 
       const port = await allocatePort();
-      const publicUrl = `http://${config.RUNNER_HOST}:${port}`;
+      // The container's PUBLIC_URL must match what end-users (and Claude
+      // Desktop's DCR client) actually reach. When MCP_DOMAIN is set we
+      // route via https://<MCP_DOMAIN>/<slug>; the hardcoded loopback URL
+      // we used to inject caused the runner to advertise an unreachable
+      // resource_metadata URL in its WWW-Authenticate header, killing OAuth
+      // discovery from any external MCP client.
+      const publicUrl = computePublicUrl(slug, port);
       const envVars: Record<string, string> = {
         ...secrets,
         PUBLIC_URL: publicUrl,
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 35e6d53..7861dce 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -66,6 +66,13 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - bmm_keys:/app/apps/api/keys
+      # Per-runner nginx snippets — written by the generator, deleted by the
+      # api when a server is removed. The host-side systemd watcher combines
+      # them into runner-map.combined + reloads nginx. Without this mount the
+      # snippet files land in an ephemeral container path and the path-routed
+      # /<slug>/* endpoints return 404 from nginx — breaking OAuth discovery
+      # for every external MCP client.
+      - /opt/buildmymcpserver/runner-map:/var/runner-map
     networks: [bmm-network]
     depends_on:
       postgres:
@@ -104,6 +111,9 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - bmm_build_context:/app/build-context
+      # Same runner-map mount as the api — generator drops the snippet on
+      # deploy, watcher concatenates, nginx reloads.
+      - /opt/buildmymcpserver/runner-map:/var/runner-map
     depends_on:
       postgres:
         condition: service_healthy