diff --git a/docker-compose.yml b/docker-compose.yml
index 550f685..ad3324c 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
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 88453e7..8b407fd 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app
 # Install dependencies
 COPY package.json package-lock.json* ./
 RUN if [ -f package-lock.json ]; then npm ci; \
-    else echo "Lockfile not found." && exit 1; fi
+    else echo "package-lock.json not found, running npm install" && npm install --production; fi
 
 # Copy source code
 COPY . .