diff --git a/Dockerfile b/Dockerfile
index 7a9c6269217147efa80cd972c70fcb40708544dd..7d76381024dce18d95212d9cfbc666f5e05cdea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder
+FROM node:8-alpine as builder
 RUN apk add --update git python alpine-sdk && \
     git clone https://github.com/magne4000/quassel-webserver.git /quassel-webserver && \
     cd /quassel-webserver && \
@@ -9,8 +9,9 @@ FROM node:alpine
 RUN apk --no-cache add ca-certificates
 COPY --from=builder /quassel-webserver /quassel-webserver
 
-ADD docker-entrypoint.sh /
+ENV NODE_ENV=production
+WORKDIR /quassel-webserver
 
 EXPOSE 64080
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["node", "app.js", "-m", "http"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100755
index f422b462b7c650e3b71fe7bd45a70bf5fa31be22..0000000000000000000000000000000000000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export NODE_ENV=production
-cd /quassel-webserver
-node app.js -m http