diff --git a/docker-compose.yml b/docker-compose.yml
index aeee7d6..9eb830a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,8 +26,8 @@ services:
   # Web Application (Next.js)
   webapp:
     build:
-      context: .
-      dockerfile: webapp/Dockerfile
+      context: ./webapp
+      dockerfile: Dockerfile
       target: runner
     container_name: infinity-webapp
     restart: unless-stopped
@@ -53,8 +53,8 @@ services:
   # Worker Service
   worker:
     build:
-      context: .
-      dockerfile: worker/Dockerfile
+      context: ./worker
+      dockerfile: Dockerfile
     container_name: infinity-worker
     restart: unless-stopped
     depends_on:
@@ -70,8 +70,8 @@ services:
   # Helper Service (runs once to create admin account)
   create-admin:
     build:
-      context: .
-      dockerfile: helpers/Dockerfile
+      context: ./helpers
+      dockerfile: Dockerfile
     container_name: infinity-create-admin
     depends_on:
       mongodb:
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 236e9c7..3e0d5b2 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -3,8 +3,9 @@ FROM node:18-alpine AS deps
 WORKDIR /app
 
 # Install dependencies
-COPY package.json package-lock.json ./
-RUN npm ci
+COPY package.json package-lock.json* ./
+RUN if [ -f package-lock.json ]; then npm ci; \
+    else echo "Lockfile not found." && exit 1; fi
 
 # Copy source code
 COPY . .