diff --git a/.dockerignore b/.dockerignore
index f06235c..bc24d64 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+.git
+.gitignore
diff --git a/Dockerfile b/Dockerfile
index 4ea8635..8817e69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:erbium-alpine
 RUN apk add python2
-WORKDIR /app
-COPY package.json yarn.lock ./
+USER node
+WORKDIR /home/node
+COPY --chown=node:node package.json yarn.lock ./
 RUN yarn
-ENTRYPOINT yarn dev
+ENTRYPOINT node build/dev-server.js
diff --git a/docker-compose.yml b/docker-compose.yml
index a5c0c1e..6833352 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
 dev:
   build: .
   volumes:
-    - .:/app
-    - /app/node_modules
+    - .:/home/node
+    # Prevent node_modules to be mounted
+    - /home/node/node_modules
   ports:
     - 8080:8080