diff --git a/apps/picture/apps/backend/Dockerfile b/apps/picture/apps/backend/Dockerfile
index 788bb1c2d..dca89e0c9 100644
--- a/apps/picture/apps/backend/Dockerfile
+++ b/apps/picture/apps/backend/Dockerfile
@@ -84,12 +84,12 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 WORKDIR /app/apps/picture/apps/backend
 
-# Expose port
-EXPOSE 3006
+# Expose port (overridden by PORT env var in docker-compose)
+EXPOSE 3040
 
-# Health check
+# Health check (overridden by docker-compose healthcheck)
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:3006/api/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT:-3040}/health || exit 1
 
 # Run entrypoint script
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/apps/picture/apps/backend/src/main.ts b/apps/picture/apps/backend/src/main.ts
index e35717f73..62b7e0ebc 100644
--- a/apps/picture/apps/backend/src/main.ts
+++ b/apps/picture/apps/backend/src/main.ts
@@ -47,8 +47,10 @@ async function bootstrap() {
 		prefix: '/uploads/',
 	});
 
-	// Set global prefix for API routes
-	app.setGlobalPrefix('api/v1');
+	// Set global prefix for API routes, exclude health/metrics
+	app.setGlobalPrefix('api/v1', {
+		exclude: ['health', 'metrics'],
+	});
 
 	const port = process.env.PORT || 3006;
 	await app.listen(port);
diff --git a/docker-compose.macmini.yml b/docker-compose.macmini.yml
index 598ab31c1..24ef2ba56 100644
--- a/docker-compose.macmini.yml
+++ b/docker-compose.macmini.yml
@@ -1637,7 +1637,7 @@ services:
     ports:
       - "3040:3040"
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3040/api/health"]
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3040/health"]
       interval: 30s
       timeout: 10s
       retries: 3