diff --git a/client/Dockerfile b/client/Dockerfile
index b7cb9eb2..32d64f24 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -21,7 +21,8 @@ COPY --from=dependencies /app/node_modules ./node_modules
 COPY --from=dependencies /app/schema/node_modules ./schema/node_modules
 COPY --from=dependencies /app/client/node_modules ./client/node_modules
 
-RUN pnpm run build --filter client
+RUN pnpm run --filter schema build \
+  && pnpm run --filter client build
 
 FROM base as production
 
@@ -42,4 +43,4 @@ ENV PORT 3000
 HEALTHCHECK --interval=30s --timeout=20s --retries=3 --start-period=15s \
     CMD curl -fSs localhost:3000 || exit 1
 
-CMD [ "pnpm", "run", "start", "--filter", "client" ]
\ No newline at end of file
+CMD [ "pnpm", "run", "--filter", "client", "start" ]
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
index 9bd02b73..323c0de3 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -2,7 +2,7 @@ FROM node:lts-alpine AS base
 
 WORKDIR /app
 
-RUN apk add --no-cache g++ git curl make python3 libc6-compat \
+RUN apk add --no-cache g++ git make curl python3 libc6-compat \
   && corepack enable && corepack prepare pnpm@latest --activate
 
 FROM base AS dependencies
@@ -21,7 +21,8 @@ COPY --from=dependencies /app/node_modules ./node_modules
 COPY --from=dependencies /app/schema/node_modules ./schema/node_modules
 COPY --from=dependencies /app/server/node_modules ./server/node_modules
 
-RUN pnpm run build --filter server
+RUN pnpm run --filter schema build \
+  && pnpm run --filter server build
 
 FROM mcr.microsoft.com/playwright:v1.32.1-focal as production
 
@@ -49,4 +50,4 @@ ENV PORT 3100
 HEALTHCHECK --interval=30s --timeout=20s --retries=3 --start-period=15s \
     CMD curl -fSs localhost:3100/health || exit 1
 
-CMD [ "pnpm", "run", "start", "--filter", "server" ]
\ No newline at end of file
+CMD [ "pnpm", "run", "--filter", "server", "start" ]
\ No newline at end of file