diff --git a/apps/calendar/apps/web/Dockerfile b/apps/calendar/apps/web/Dockerfile
index 82d5eb86c..c85e2fa72 100644
--- a/apps/calendar/apps/web/Dockerfile
+++ b/apps/calendar/apps/web/Dockerfile
@@ -1,104 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://calendar-backend:3014
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://calendar-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-splitscreen ./packages/shared-splitscreen
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-types ./packages/shared-types
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/calendar/packages/shared ./apps/calendar/packages/shared
-# --- END AUTO-GENERATED ---
-
 COPY apps/calendar/apps/web ./apps/calendar/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
-
-# Build the web app
 WORKDIR /app/apps/calendar/apps/web
 RUN pnpm exec svelte-kit sync
 RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/calendar/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/calendar/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/calendar/apps/web/build ./build
 COPY --from=builder /app/apps/calendar/apps/web/package.json ./
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5012
-ENV HOST=0.0.0.0
+EXPOSE 5012
+ENV NODE_ENV=production PORT=5012 HOST=0.0.0.0
 
-EXPOSE ${PORT}
-
-# Health check using PORT env var
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT}/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5012/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/chat/apps/web/Dockerfile b/apps/chat/apps/web/Dockerfile
index 3af28d8e7..99131c30b 100644
--- a/apps/chat/apps/web/Dockerfile
+++ b/apps/chat/apps/web/Dockerfile
@@ -1,103 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://chat-backend:3002
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://chat-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/chat/packages/chat-types ./apps/chat/packages/chat-types
-# --- END AUTO-GENERATED ---
-
 COPY apps/chat/apps/web ./apps/chat/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/chat/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/chat/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/chat/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/chat/apps/web/build ./build
 COPY --from=builder /app/apps/chat/apps/web/package.json ./
 
-# Expose port
-EXPOSE 3000
+EXPOSE 5010
+ENV NODE_ENV=production PORT=5010 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=3000
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:3000/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5010/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/citycorners/apps/web/Dockerfile b/apps/citycorners/apps/web/Dockerfile
index 3f4306088..e8e3baa51 100644
--- a/apps/citycorners/apps/web/Dockerfile
+++ b/apps/citycorners/apps/web/Dockerfile
@@ -1,104 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
+ARG PUBLIC_BACKEND_URL=http://citycorners-server
 ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
-ARG PUBLIC_CITYCORNERS_API_URL=http://citycorners-backend:3025
-
-# Set as environment variables for build
+ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV PUBLIC_CITYCORNERS_API_URL=$PUBLIC_CITYCORNERS_API_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-# --- END AUTO-GENERATED ---
-
-# Copy citycorners web
 COPY apps/citycorners/apps/web ./apps/citycorners/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/citycorners/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
 WORKDIR /app/apps/citycorners/apps/web
-
-# Copy the pnpm store that symlinks point to
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules
 COPY --from=builder /app/apps/citycorners/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/citycorners/apps/web/build ./build
 COPY --from=builder /app/apps/citycorners/apps/web/package.json ./
 
-# Copy entrypoint script
-COPY apps/citycorners/apps/web/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+EXPOSE 5022
+ENV NODE_ENV=production PORT=5022 HOST=0.0.0.0
 
-# Expose port
-EXPOSE 5018
-
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5018
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5018/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5022/health || exit 1
 
-# Run the app
-ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["node", "build"]
diff --git a/apps/clock/apps/web/Dockerfile b/apps/clock/apps/web/Dockerfile
index 786436014..98ea7cd3c 100644
--- a/apps/clock/apps/web/Dockerfile
+++ b/apps/clock/apps/web/Dockerfile
@@ -1,103 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://clock-backend:3017
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://mana-auth
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/clock/packages/shared ./apps/clock/packages/shared
-# --- END AUTO-GENERATED ---
-
 COPY apps/clock/apps/web ./apps/clock/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/clock/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/clock/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/clock/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/clock/apps/web/build ./build
 COPY --from=builder /app/apps/clock/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5187
+EXPOSE 5013
+ENV NODE_ENV=production PORT=5013 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5187
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5187/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5013/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/contacts/apps/web/Dockerfile b/apps/contacts/apps/web/Dockerfile
index 947cb5e8c..4460c492b 100644
--- a/apps/contacts/apps/web/Dockerfile
+++ b/apps/contacts/apps/web/Dockerfile
@@ -1,105 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://contacts-backend:3015
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://contacts-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-splitscreen ./packages/shared-splitscreen
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/spiral-db ./packages/spiral-db
-COPY packages/subscriptions ./packages/subscriptions
-# --- END AUTO-GENERATED ---
-
-# Copy contacts web
 COPY apps/contacts/apps/web ./apps/contacts/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/contacts/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/contacts/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/contacts/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/contacts/apps/web/build ./build
 COPY --from=builder /app/apps/contacts/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5184
+EXPOSE 5014
+ENV NODE_ENV=production PORT=5014 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5184
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5184/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5014/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/manacore/apps/web/Dockerfile b/apps/manacore/apps/web/Dockerfile
index 0b1862816..fee4cb6f3 100644
--- a/apps/manacore/apps/web/Dockerfile
+++ b/apps/manacore/apps/web/Dockerfile
@@ -1,106 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-ARG MIDDLEWARE_URL=http://mana-core-middleware:3000
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://mana-auth
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
+ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV MIDDLEWARE_URL=$MIDDLEWARE_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/credits ./packages/credits
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/qr-export ./packages/qr-export
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-config ./packages/shared-config
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-types ./packages/shared-types
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
-COPY packages/wallpaper-generator ./packages/wallpaper-generator
-# --- END AUTO-GENERATED ---
-
-# Copy manacore web
 COPY apps/manacore/apps/web ./apps/manacore/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/manacore/apps/web
 RUN pnpm exec svelte-kit sync
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/manacore/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/manacore/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/manacore/apps/web/build ./build
 COPY --from=builder /app/apps/manacore/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5173
+EXPOSE 5000
+ENV NODE_ENV=production PORT=5000 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5173
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5173/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5000/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/manadeck/apps/web/Dockerfile b/apps/manadeck/apps/web/Dockerfile
index dd25b4138..42804a885 100644
--- a/apps/manadeck/apps/web/Dockerfile
+++ b/apps/manadeck/apps/web/Dockerfile
@@ -1,96 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://manadeck-backend:3009
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://manadeck-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-config ./packages/shared-config
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-types ./packages/shared-types
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
-# --- END AUTO-GENERATED ---
-
-# Copy manadeck web
 COPY apps/manadeck/apps/web ./apps/manadeck/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/manadeck/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/manadeck/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/manadeck/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/manadeck/apps/web/build ./build
 COPY --from=builder /app/apps/manadeck/apps/web/package.json ./
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV HOST=0.0.0.0
+EXPOSE 5015
+ENV NODE_ENV=production PORT=5015 HOST=0.0.0.0
+
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5015/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/matrix/apps/web/Dockerfile b/apps/matrix/apps/web/Dockerfile
index 232a50478..350f60dfc 100644
--- a/apps/matrix/apps/web/Dockerfile
+++ b/apps/matrix/apps/web/Dockerfile
@@ -1,89 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://mana-auth
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
+ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-ui ./packages/shared-ui
-# --- END AUTO-GENERATED ---
-
-# Copy matrix web app
+COPY apps/matrix/packages/shared ./apps/matrix/packages/shared
 COPY apps/matrix/apps/web ./apps/matrix/apps/web
 
-# Remove react-native patches (not applicable in web-only context) then install
-RUN node -e "const p=require('./package.json'); delete p.pnpm?.patchedDependencies; require('fs').writeFileSync('./package.json', JSON.stringify(p, null, 2))"
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/matrix/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/matrix/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/matrix/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/matrix/apps/web/build ./build
 COPY --from=builder /app/apps/matrix/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5180
+EXPOSE 5024
+ENV NODE_ENV=production PORT=5024 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5180
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5180/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5024/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/mukke/apps/web/Dockerfile b/apps/mukke/apps/web/Dockerfile
index d6c2dbef4..ad4ea950d 100644
--- a/apps/mukke/apps/web/Dockerfile
+++ b/apps/mukke/apps/web/Dockerfile
@@ -1,109 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
+ARG PUBLIC_BACKEND_URL=http://mukke-server
 ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
-ARG PUBLIC_BACKEND_URL=http://mukke-backend:3010
-
-# Set as environment variables for build
-ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
+ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-splitscreen ./packages/shared-splitscreen
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
 COPY apps/mukke/packages/shared ./apps/mukke/packages/shared
-# --- END AUTO-GENERATED ---
-
-# Copy mukke web
 COPY apps/mukke/apps/web ./apps/mukke/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/mukke/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/mukke/apps/web
-
-# Copy the pnpm store that symlinks point to
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules
 COPY --from=builder /app/apps/mukke/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/mukke/apps/web/build ./build
 COPY --from=builder /app/apps/mukke/apps/web/package.json ./
 
-# Copy entrypoint script
-COPY apps/mukke/apps/web/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+EXPOSE 5016
+ENV NODE_ENV=production PORT=5016 HOST=0.0.0.0
 
-# Expose port
-EXPOSE 5180
-
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5180
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5180/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5016/health || exit 1
 
-# Run the app
-ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["node", "build"]
diff --git a/apps/nutriphi/apps/web/Dockerfile b/apps/nutriphi/apps/web/Dockerfile
index 318f9f73f..a51f0c0bd 100644
--- a/apps/nutriphi/apps/web/Dockerfile
+++ b/apps/nutriphi/apps/web/Dockerfile
@@ -1,98 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://nutriphi-backend:3023
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://nutriphi-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-types ./packages/shared-types
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/nutriphi/packages/shared ./apps/nutriphi/packages/shared
-# --- END AUTO-GENERATED ---
-
 COPY apps/nutriphi/apps/web ./apps/nutriphi/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/nutriphi/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/nutriphi/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/nutriphi/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/nutriphi/apps/web/build ./build
 COPY --from=builder /app/apps/nutriphi/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5189
+EXPOSE 5017
+ENV NODE_ENV=production PORT=5017 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5189
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5189/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5017/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/photos/apps/web/Dockerfile b/apps/photos/apps/web/Dockerfile
index e2b5763c1..ebf0585f7 100644
--- a/apps/photos/apps/web/Dockerfile
+++ b/apps/photos/apps/web/Dockerfile
@@ -1,107 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://photos-backend:3039
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-ARG PUBLIC_MANA_MEDIA_URL=http://mana-media:3015
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://photos-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV PUBLIC_MANA_MEDIA_URL=$PUBLIC_MANA_MEDIA_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-splitscreen ./packages/shared-splitscreen
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/photos/packages/shared ./apps/photos/packages/shared
-# --- END AUTO-GENERATED ---
-
-# Copy photos web
 COPY apps/photos/apps/web ./apps/photos/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/photos/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/photos/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/photos/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/photos/apps/web/build ./build
 COPY --from=builder /app/apps/photos/apps/web/package.json ./
 
-# Expose port
 EXPOSE 5019
+ENV NODE_ENV=production PORT=5019 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5019
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
   CMD wget --no-verbose --tries=1 --spider http://localhost:5019/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/picture/apps/web/Dockerfile b/apps/picture/apps/web/Dockerfile
index 59fdfa0a5..6246f75aa 100644
--- a/apps/picture/apps/web/Dockerfile
+++ b/apps/picture/apps/web/Dockerfile
@@ -1,109 +1,34 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://picture-backend:3040
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-ARG PUBLIC_GOOGLE_CLIENT_ID=
-ARG PUBLIC_APPLE_CLIENT_ID=
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://picture-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV PUBLIC_GOOGLE_CLIENT_ID=$PUBLIC_GOOGLE_CLIENT_ID
-ENV PUBLIC_APPLE_CLIENT_ID=$PUBLIC_APPLE_CLIENT_ID
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/picture/packages/design-tokens ./apps/picture/packages/design-tokens
+COPY apps/picture/packages/mobile-ui ./apps/picture/packages/mobile-ui
 COPY apps/picture/packages/shared ./apps/picture/packages/shared
-# --- END AUTO-GENERATED ---
-
-# Copy picture web
 COPY apps/picture/apps/web ./apps/picture/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/picture/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/picture/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/picture/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/picture/apps/web/build ./build
 COPY --from=builder /app/apps/picture/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5021
+EXPOSE 5018
+ENV NODE_ENV=production PORT=5018 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5021
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5021/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5018/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/playground/apps/web/Dockerfile b/apps/playground/apps/web/Dockerfile
index bd400cb70..bb42a3487 100644
--- a/apps/playground/apps/web/Dockerfile
+++ b/apps/playground/apps/web/Dockerfile
@@ -1,76 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-ARG PUBLIC_MANA_LLM_URL=http://mana-llm:3025
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://mana-auth
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
+ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV PUBLIC_MANA_LLM_URL=$PUBLIC_MANA_LLM_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-# --- END AUTO-GENERATED ---
-
-# Copy llm-playground service
 COPY apps/playground/apps/web ./apps/playground/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-# Build the web app
 WORKDIR /app/apps/playground/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/playground/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/playground/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/playground/apps/web/build ./build
 COPY --from=builder /app/apps/playground/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5190
+EXPOSE 5026
+ENV NODE_ENV=production PORT=5026 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5190
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5190/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5026/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/presi/apps/web/Dockerfile b/apps/presi/apps/web/Dockerfile
index 6e7315456..8bbdc4b99 100644
--- a/apps/presi/apps/web/Dockerfile
+++ b/apps/presi/apps/web/Dockerfile
@@ -1,100 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://presi-backend:3008
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://presi-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/presi/packages/shared ./apps/presi/packages/shared
-# --- END AUTO-GENERATED ---
-
-# Copy presi web
 COPY apps/presi/apps/web ./apps/presi/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/presi/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/presi/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/presi/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/presi/apps/web/build ./build
 COPY --from=builder /app/apps/presi/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5178
+EXPOSE 5020
+ENV NODE_ENV=production PORT=5020 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5178
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5178/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5020/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/skilltree/apps/web/Dockerfile b/apps/skilltree/apps/web/Dockerfile
index 4402542d5..e04e76f2c 100644
--- a/apps/skilltree/apps/web/Dockerfile
+++ b/apps/skilltree/apps/web/Dockerfile
@@ -1,96 +1,31 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://skilltree-backend:3038
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://mana-auth
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/help ./packages/help
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-# --- END AUTO-GENERATED ---
-
-# Copy skilltree web
 COPY apps/skilltree/apps/web ./apps/skilltree/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/skilltree/apps/web
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
 WORKDIR /app/apps/skilltree/apps/web
-
-# Copy the pnpm store that symlinks point to
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules
 COPY --from=builder /app/apps/skilltree/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/skilltree/apps/web/build ./build
 COPY --from=builder /app/apps/skilltree/apps/web/package.json ./
 
-# Expose port
-EXPOSE 5020
+EXPOSE 5021
+ENV NODE_ENV=production PORT=5021 HOST=0.0.0.0
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5020
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5020/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5021/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/storage/apps/web/Dockerfile b/apps/storage/apps/web/Dockerfile
index 67441b512..805d07543 100644
--- a/apps/storage/apps/web/Dockerfile
+++ b/apps/storage/apps/web/Dockerfile
@@ -1,96 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
-ARG PUBLIC_BACKEND_URL=http://storage-backend:3016
-ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-core-auth:3001
-
-# Set as environment variables for build
+ARG PUBLIC_BACKEND_URL=http://storage-server
+ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
 ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/subscriptions ./packages/subscriptions
-# --- END AUTO-GENERATED ---
-
-# Copy storage web
+COPY apps/storage/packages/shared ./apps/storage/packages/shared
 COPY apps/storage/apps/web ./apps/storage/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-# Build the web app
 WORKDIR /app/apps/storage/apps/web
-ENV NODE_OPTIONS="--max-old-space-size=4096"
 RUN pnpm exec svelte-kit sync
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/storage/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/storage/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/storage/apps/web/build ./build
 COPY --from=builder /app/apps/storage/apps/web/package.json ./
 
-# Set environment variables
-ENV NODE_ENV=production
-ENV HOST=0.0.0.0
+EXPOSE 5023
+ENV NODE_ENV=production PORT=5023 HOST=0.0.0.0
+
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5023/health || exit 1
 
-# Run the app
 CMD ["node", "build"]
diff --git a/apps/zitare/apps/web/Dockerfile b/apps/zitare/apps/web/Dockerfile
index bb3a4c0a7..13f0964f7 100644
--- a/apps/zitare/apps/web/Dockerfile
+++ b/apps/zitare/apps/web/Dockerfile
@@ -1,118 +1,32 @@
 # syntax=docker/dockerfile:1
-# Build stage
-FROM node:20-alpine AS builder
+FROM sveltekit-base:local AS builder
 
-# Build arguments for SvelteKit static env vars
+ARG PUBLIC_BACKEND_URL=http://mana-auth
 ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001
-ARG PUBLIC_ZITARE_API_URL=http://zitare-backend:3007
-
-# Set as environment variables for build
+ENV PUBLIC_BACKEND_URL=$PUBLIC_BACKEND_URL
 ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL
-ENV PUBLIC_ZITARE_API_URL=$PUBLIC_ZITARE_API_URL
 
-# Install pnpm
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
-
-WORKDIR /app
-
-# Copy root workspace files
-COPY pnpm-workspace.yaml ./
-COPY package.json ./
-COPY pnpm-lock.yaml ./
-
-# --- AUTO-GENERATED COPY STATEMENTS (do not edit manually) ---
-COPY packages/feedback ./packages/feedback
-COPY packages/eslint-config ./packages/eslint-config
-COPY packages/help ./packages/help
-COPY packages/local-store ./packages/local-store
-COPY packages/shared-api-client ./packages/shared-api-client
-COPY packages/shared-app-onboarding ./packages/shared-app-onboarding
-COPY packages/shared-auth ./packages/shared-auth
-COPY packages/shared-auth-stores ./packages/shared-auth-stores
-COPY packages/shared-auth-ui ./packages/shared-auth-ui
-COPY packages/shared-branding ./packages/shared-branding
-COPY packages/shared-error-tracking ./packages/shared-error-tracking
-COPY packages/shared-i18n ./packages/shared-i18n
-COPY packages/shared-icons ./packages/shared-icons
-COPY packages/shared-profile-ui ./packages/shared-profile-ui
-COPY packages/shared-pwa ./packages/shared-pwa
-COPY packages/shared-stores ./packages/shared-stores
-COPY packages/shared-tags ./packages/shared-tags
-COPY packages/shared-tailwind ./packages/shared-tailwind
-COPY packages/shared-theme ./packages/shared-theme
-COPY packages/shared-theme-ui ./packages/shared-theme-ui
-COPY packages/shared-ui ./packages/shared-ui
-COPY packages/shared-utils ./packages/shared-utils
-COPY packages/shared-vite-config ./packages/shared-vite-config
-COPY packages/spiral-db ./packages/spiral-db
-COPY packages/subscriptions ./packages/subscriptions
 COPY apps/zitare/packages/content ./apps/zitare/packages/content
-# --- END AUTO-GENERATED ---
-
-# Copy zitare web
 COPY apps/zitare/apps/web ./apps/zitare/apps/web
 
-# Install dependencies
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    pnpm install --no-frozen-lockfile --ignore-scripts
 
-# Build shared packages that need building
-WORKDIR /app/packages/shared-vite-config
-RUN pnpm build
-
-WORKDIR /app/packages/shared-auth
-RUN pnpm build || true
-
-WORKDIR /app/packages/shared-error-tracking
-RUN pnpm build
-
-WORKDIR /app/packages/shared-pwa
-RUN pnpm build
-
-WORKDIR /app/packages/spiral-db
-RUN pnpm build || true
-
-# Build zitare content package
-WORKDIR /app/apps/zitare/packages/content
-RUN pnpm build || true
-
-# Build the web app
 WORKDIR /app/apps/zitare/apps/web
 RUN pnpm exec svelte-kit sync
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-RUN pnpm build
+RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build
 
-# Production stage
 FROM node:20-alpine AS production
-
-# Keep same directory structure as builder so pnpm symlinks resolve correctly
 WORKDIR /app/apps/zitare/apps/web
-
-# Copy the pnpm store that symlinks point to (at /app/node_modules/.pnpm)
 COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm
-
-# Copy the app's node_modules (contains symlinks to the pnpm store)
 COPY --from=builder /app/apps/zitare/apps/web/node_modules ./node_modules
-
-# Copy built application
 COPY --from=builder /app/apps/zitare/apps/web/build ./build
 COPY --from=builder /app/apps/zitare/apps/web/package.json ./
 
-# Copy entrypoint script
-COPY apps/zitare/apps/web/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+EXPOSE 5025
+ENV NODE_ENV=production PORT=5025 HOST=0.0.0.0
 
-# Expose port
-EXPOSE 5018
-
-# Set environment variables
-ENV NODE_ENV=production
-ENV PORT=5018
-ENV HOST=0.0.0.0
-
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:5018/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:5025/health || exit 1
 
-# Run the app
-ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["node", "build"]