diff --git a/apps/calendar/apps/backend/Dockerfile b/apps/calendar/apps/backend/Dockerfile
index 5f40e89c1..e0d47b3c9 100644
--- a/apps/calendar/apps/backend/Dockerfile
+++ b/apps/calendar/apps/backend/Dockerfile
@@ -34,6 +34,9 @@ RUN pnpm build
 WORKDIR /app/packages/shared-nestjs-auth
 RUN pnpm build
 
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 # Build the backend
 WORKDIR /app/apps/calendar/apps/backend
 RUN pnpm build
diff --git a/apps/chat/apps/backend/Dockerfile b/apps/chat/apps/backend/Dockerfile
index dcbc8d98c..37bbb4b9f 100644
--- a/apps/chat/apps/backend/Dockerfile
+++ b/apps/chat/apps/backend/Dockerfile
@@ -38,6 +38,9 @@ RUN pnpm build
 WORKDIR /app/packages/shared-nestjs-auth
 RUN pnpm build
 
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 WORKDIR /app/packages/shared-storage
 RUN pnpm build
 
diff --git a/apps/clock/apps/backend/Dockerfile b/apps/clock/apps/backend/Dockerfile
index 4d245bfeb..fc5fe16ea 100644
--- a/apps/clock/apps/backend/Dockerfile
+++ b/apps/clock/apps/backend/Dockerfile
@@ -34,6 +34,9 @@ RUN pnpm build
 WORKDIR /app/packages/shared-nestjs-auth
 RUN pnpm build
 
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 # Build the backend
 WORKDIR /app/apps/clock/apps/backend
 RUN pnpm build
diff --git a/apps/picture/apps/backend/Dockerfile b/apps/picture/apps/backend/Dockerfile
index d38e0b0d4..c8e5ce81b 100644
--- a/apps/picture/apps/backend/Dockerfile
+++ b/apps/picture/apps/backend/Dockerfile
@@ -38,6 +38,9 @@ RUN pnpm build
 WORKDIR /app/packages/shared-nestjs-auth
 RUN pnpm build
 
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 WORKDIR /app/packages/shared-storage
 RUN pnpm build
 
@@ -69,11 +72,11 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 WORKDIR /app/apps/picture/apps/backend
 
 # Expose port
-EXPOSE 3003
+EXPOSE 3006
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:3003/api/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:3006/api/v1/health || exit 1
 
 # Run entrypoint script
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/apps/todo/apps/backend/Dockerfile b/apps/todo/apps/backend/Dockerfile
index 17aff77d7..1285e77fe 100644
--- a/apps/todo/apps/backend/Dockerfile
+++ b/apps/todo/apps/backend/Dockerfile
@@ -33,6 +33,9 @@ RUN pnpm build
 WORKDIR /app/packages/shared-nestjs-auth
 RUN pnpm build
 
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 # Build the backend
 WORKDIR /app/apps/todo/apps/backend
 RUN pnpm build
diff --git a/packages/shared-nestjs-cors/package.json b/packages/shared-nestjs-cors/package.json
index 5e99e04d9..c50f5a4ce 100644
--- a/packages/shared-nestjs-cors/package.json
+++ b/packages/shared-nestjs-cors/package.json
@@ -2,15 +2,16 @@
 	"name": "@manacore/shared-nestjs-cors",
 	"version": "0.0.1",
 	"private": true,
-	"main": "./src/index.ts",
-	"types": "./src/index.ts",
+	"main": "./dist/index.js",
+	"types": "./dist/index.d.ts",
 	"exports": {
 		".": {
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
+			"types": "./dist/index.d.ts",
+			"default": "./dist/index.js"
 		}
 	},
 	"scripts": {
+		"build": "tsc",
 		"type-check": "tsc --noEmit",
 		"test": "jest",
 		"test:watch": "jest --watch",
diff --git a/services/mana-core-auth/Dockerfile b/services/mana-core-auth/Dockerfile
index a2d7585ce..42c3c7899 100644
--- a/services/mana-core-auth/Dockerfile
+++ b/services/mana-core-auth/Dockerfile
@@ -20,6 +20,10 @@ COPY services/mana-core-auth ./services/mana-core-auth
 # Install all dependencies (including devDependencies for build)
 RUN pnpm install --frozen-lockfile
 
+# Build shared packages first
+WORKDIR /app/packages/shared-nestjs-cors
+RUN pnpm build
+
 # Build the application
 WORKDIR /app/services/mana-core-auth
 RUN pnpm build