diff --git a/Dockerfile b/Dockerfile
index df3b762..7e141d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,19 +2,34 @@ FROM alpine:edge
 
 LABEL maintainer="Andreas Peters <support@aventer.biz>"
 
+COPY ./ /home/node
+
 RUN echo http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
-    apk add --no-cache git nodejs npm tini websockify
+    apk add --no-cache git nodejs npm tini websockify && \
+    adduser -D -g 1001 -u 1001 -h /home/node node && \
+    mkdir -p /home/node && \
+    mkdir -p /home/node/.npm-global && \
+    mkdir -p /home/node/app  && \
+    chown -R node: /home/node 
 
-COPY ./ /opt/mumble-web/
+USER node
 
-WORKDIR /opt/mumble-web
+ENV PATH=/home/node/.npm-global/bin:$PATH
+ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 
+RUN cd /home/node && \
+    npm install && \
+    npm run build 
 
-RUN npm install && npm run build
+USER root
 
-EXPOSE 80
+RUN apk del gcc git make g++
+
+USER node
+
+EXPOSE 8080
 ENV MUMBLE_SERVER=mumble.aventer.biz:64738
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD websockify --ssl-target --web /opt/mumble-web/dist 80 "$MUMBLE_SERVER"
+CMD websockify --ssl-target --web /home/node/dist 8080 "$MUMBLE_SERVER"