diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index c38b0c2bd77b36375d90c524cf19430e727c98fd..329ebe6430f3923cedc37bfc587a93edd8bf1c73 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -32,10 +32,9 @@ services:
     - DEBUG=1
     build:
       context: ./frontend
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev
     volumes:
       - ${codedir}/librephotos-frontend:/usr/src/app
-      - ./frontend/entrypoint.sh:/entrypoint.sh
 
   backend:
     tty: true
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index ac9217706f58d1a9249b41b97684abfed28739cc..b33042781bd0f00b093ed153a7083ecb1df1cfee 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,15 +1,19 @@
-FROM node:13-slim
+FROM node:13-slim as builder
 
-RUN apt-get update && apt-get install -y curl git xsel
+RUN apt-get update && apt-get install -y git
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
-RUN npm install -g serve
 ENV CLI_WIDTH 80
 RUN git clone https://github.com/LibrePhotos/librephotos-frontend /usr/src/app
 RUN npm install --legacy-peer-deps
 RUN npm run build
 
+FROM halverneus/static-file-server
+ENV PORT 3000
 EXPOSE 3000
-COPY entrypoint.sh /entrypoint.sh
-CMD ["/entrypoint.sh"]
+
+COPY --from=builder /usr/src/app/build /web
+
+ENTRYPOINT ["/serve"]
+CMD []
\ No newline at end of file
diff --git a/frontend/Dockerfile.dev b/frontend/Dockerfile.dev
new file mode 100644
index 0000000000000000000000000000000000000000..f45dbc4a237a553b633705b1cc27620dc875520b
--- /dev/null
+++ b/frontend/Dockerfile.dev
@@ -0,0 +1,8 @@
+FROM node:13-slim
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+EXPOSE 3000
+COPY entrypoint.sh /entrypoint.sh
+CMD ["/entrypoint.sh"]
diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh
index d940e28ae73f6246364978db299c56e1c19ebccd..3e2fe84f338290fbdfa8537f03fd20494cb0e281 100755
--- a/frontend/entrypoint.sh
+++ b/frontend/entrypoint.sh
@@ -2,14 +2,6 @@
 
 echo "installing frontend"
 npm install --legacy-peer-deps
+npm run start
 
-echo "serving frontend"
-if [ "$DEBUG" = 1 ]
-then
-    echo "develompent running frontend"
-    npm run start
-else
-    echo "productions running frontend"
-    serve build -d -l 3000
-fi
 # DANGEROUSLY_DISABLE_HOST_CHECK=true HOST=0.0.0.0 npm start