diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile
index 3b0634dc4e..be44264053 100644
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -93,6 +93,7 @@ RUN npm install -g pnpm
 COPY ./package*.json ./
 COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
 COPY ./lerna.json ./lerna.json
+COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY ./packages/server/package*.json ./packages/server/
 
 # Install application dependencies
diff --git a/packages/webapp/Dockerfile b/packages/webapp/Dockerfile
index 08f1d6f008..72db057691 100644
--- a/packages/webapp/Dockerfile
+++ b/packages/webapp/Dockerfile
@@ -8,6 +8,7 @@ WORKDIR /app
 COPY ./package*.json ./
 COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
 COPY ./lerna.json ./lerna.json
+COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY ./packages/webapp/package*.json ./packages/webapp/
 
 # Install application dependencies
@@ -23,7 +24,7 @@ RUN pnpm install
 
 # Build webapp package
 COPY ./packages/webapp /app/packages/webapp
-RUN npm run build:webapp
+RUN pnpm run build:webapp
 
 FROM nginx