diff --git a/Dockerfile b/Dockerfile
index fe02956..533c610 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
 ### STAGE 1: Build ###
-FROM node:12.7-alpine AS build
+FROM node:alpine AS builder
+
 RUN mkdir /crc-bpmn
 WORKDIR /crc-bpmn
-COPY package.json ./
-RUN npm install
-COPY . .
-RUN npm run build:staging
+
+ADD package.json /crc-bpmn/
+
+COPY . /crc-bpmn/
+
+RUN npm install && \
+    npm run build:staging
 
 ### STAGE 2: Run ###
-FROM nginx:1.17.1-alpine
-COPY --from=build /crc-bpmn/dist/cr-connect-bpmn /usr/share/nginx/html
-
-# expose ports
-EXPOSE 80
+FROM nginx:alpine
+COPY --from=builder /crc-bpmn/dist/cr-connect-bpmn /usr/share/nginx/html/