diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index 1d23f8a0b..6fd9c54fd 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /app
 
 # Install pnpm and bun
 RUN corepack enable && corepack prepare pnpm@latest --activate
-RUN npm install -g bun@1.2.15
+RUN npm install -g bun@1.2.21
 
 # Copy only package files for dependency resolution
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml turbo.json ./
@@ -28,7 +28,7 @@ WORKDIR /app
 
 # Install pnpm and bun
 RUN corepack enable && corepack prepare pnpm@latest --activate
-RUN npm install -g bun@1.2.15
+RUN npm install -g bun@1.2.21
 
 # Set build environment
 ENV DOCKER_BUILD=true
@@ -57,7 +57,7 @@ RUN bun build src/index.ts --outdir ./dist --target bun --external pino-pretty &
 # ================================================================
 # Stage 3: Production Runtime
 # Minimal image with only what's needed to run
-FROM oven/bun:1.2.15-alpine AS runtime
+FROM oven/bun:1.2.21-alpine AS runtime
 WORKDIR /app
 
 # Set production environment
diff --git a/apps/server/Dockerfile.prebuilt b/apps/server/Dockerfile.prebuilt
index 6c17913f5..986d8dec7 100644
--- a/apps/server/Dockerfile.prebuilt
+++ b/apps/server/Dockerfile.prebuilt
@@ -3,7 +3,7 @@
 # This expects the app to be already built by GitHub Actions
 # ================================================================
 
-FROM oven/bun:1.2.15-alpine AS runtime
+FROM oven/bun:1.2.21-alpine AS runtime
 
 WORKDIR /app
 
diff --git a/apps/server/package.json b/apps/server/package.json
index 8a09fd069..598f38c2c 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -10,7 +10,7 @@
     "prebuild": "[ \"$SKIP_ENV_CHECK\" = \"true\" ] || (tsx scripts/validate-env.ts && pnpm run typecheck)",
     "build": "tsup",
     "build:dry-run": "tsup",
-    "dev": "bun --watch src/index.ts",
+    "dev": "bun --watch --inspect src/index.ts",
     "dev:fast": "bun --watch src/index.ts",
     "dev:build": "tsup --watch",
     "lint": "biome check --write",
diff --git a/apps/server/test-docker.sh b/apps/server/test-docker.sh
index 13bfaf149..f5fc44f0e 100755
--- a/apps/server/test-docker.sh
+++ b/apps/server/test-docker.sh
@@ -44,7 +44,7 @@ fi
 
 echo -e "${BLUE}📋 Build Information:${NC}"
 echo "- Using optimized Bun-based multi-stage Dockerfile"
-echo "- Base image: oven/bun:1.2.15-alpine (includes Node.js compatibility)"
+echo "- Base image: oven/bun:1.2.21-alpine (includes Node.js compatibility)"
 echo "- Package manager: pnpm (installed in container)"
 echo "- Build context: repository root (for workspace dependencies)"
 echo ""
@@ -157,7 +157,7 @@ echo "- Image: $IMAGE_NAME"
 echo "- Container: $CONTAINER_NAME"
 echo "- Port exposed: $HOST_PORT -> $SERVER_PORT"
 echo "- Health check: ✅ PASSED"
-echo "- Base image: oven/bun:1.2.15-alpine"
+echo "- Base image: oven/bun:1.2.21-alpine"
 echo "- Runtime: Bun with Node.js compatibility"
 
 # No cleanup needed since we're not creating temporary files