diff --git a/Dockerfile b/Dockerfile
index 99a276e8e8..44f7b729fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,16 @@
-FROM nginx
+# Stage 1: Build application
+FROM node:13.13.0 AS compile-image
 
-MAINTAINER maintainers@vikunja.io
+WORKDIR /build
+
+COPY .  ./
+
+RUN yarn install --frozen-lockfile
+RUN yarn run build
+
+
+# Stage 2: copy 
+FROM nginx
 
 RUN apt-get update && apt-get install -y apt-utils openssl && \
   mkdir -p /etc/nginx/ssl && \
@@ -8,6 +18,9 @@ RUN apt-get update && apt-get install -y apt-utils openssl && \
   openssl req -new -key /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.csr -subj "/C=DE/L=Berlin/O=Vikunja/CN=Vikunja Snakeoil" && \
   openssl x509 -req -days 3650 -in /etc/nginx/ssl/dummy.csr -signkey /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.crt
 
-ADD nginx.conf /etc/nginx/nginx.conf
+COPY nginx.conf /etc/nginx/nginx.conf
 
-COPY dist /usr/share/nginx/html
\ No newline at end of file
+# copy compiled files from stage 1
+COPY --from=compile-image /build/dist /usr/share/nginx/html
+
+LABEL maintainer="maintainers@vikunja.io"
\ No newline at end of file