diff --git a/deployment/frontend/Dockerfile b/deployment/frontend/Dockerfile
index 41c7b43..8bad32e 100644
--- a/deployment/frontend/Dockerfile
+++ b/deployment/frontend/Dockerfile
@@ -3,11 +3,13 @@ FROM node:24 AS frontend
 
 # 1.1. Install npm dependencies
 WORKDIR /app
+# Copy package.json and workspace package directory first (needed for workspace resolution)
 COPY package.json .
+COPY frontend/packages/ frontend/packages/
 RUN --mount=type=cache,target=/root/.npm \
     npm install --ignore-scripts
 
-# 1.2. Build
+# 1.2. Copy remaining frontend code and build
 COPY frontend frontend
 RUN npm run frontend:build
 
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 17ef91f..6f4858b 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -329,6 +329,7 @@ for SERVICE in $SERVICES; do
         echo ""
     else
         error "Build failed for $SERVICE"
+        exit 1
     fi
 done