diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index bfc08aa30..f4aeaebfc 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -50,6 +50,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
           context: .
+          file: ./packages/webapp/Dockerfile
           push: true
           tags: ghcr.io/bigcapitalhq/client:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/packages/webapp/Dockerfile b/packages/webapp/Dockerfile
index a783fff8b..653e9fbe8 100644
--- a/packages/webapp/Dockerfile
+++ b/packages/webapp/Dockerfile
@@ -4,17 +4,20 @@ USER root
 
 WORKDIR /app
 
-COPY ./package.json /app/package.json
-COPY ./package-lock.json /app/package-lock.json
+# Install dependencies
+COPY package.json ./
+COPY lerna.json ./
+
+COPY ./packages/webapp/package.json /app/packages/webapp/package.json
 
 RUN npm install
+RUN npm run bootstrap
 
-COPY . .
-
-RUN npm run build
+# Build webapp package
+COPY ./packages/webapp /app/packages/webapp
+RUN npm run build:webapp
 
 FROM nginx
 
-COPY ./nginx/sites/default.conf /etc/nginx/conf.d/default.conf
-
-COPY --from=build /app/build /usr/share/nginx/html
\ No newline at end of file
+COPY ./packages/webapp/nginx/sites/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/packages/webapp/build /usr/share/nginx/html