diff --git a/Dockerfile b/Dockerfile
index d6be1599..8337f046 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
-FROM node:6-alpine
+FROM node:8-alpine
 
 RUN apk update && apk upgrade && \
     apk add --no-cache bash git openssh
 
 ENV WIKI_JS_DOCKER 1
 
-RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 RUN npm install wiki.js@latest
 
 EXPOSE 3000
-CMD [ "node", "server" ]
+ENTRYPOINT [ "node", "server" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 3918567c..c4bad4c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,10 @@ services:
       - '27017'
     command: '--smallfiles --logpath=/dev/null'
   wikijs:
-    image: 'requarks/wiki:master'
+    image: 'requarks/wiki:latest'
     links:
       - wikidb
     ports:
       - '3000'
     environment:
-      - PORT: 3000
+      - PORT=3000