diff --git a/Dockerfile b/Dockerfile
index ebca232..6719dac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,6 @@
-## Start Hack
-FROM debian:jessie-slim
-## All of this needed because of missing 8.11.x tag.  Once we update to 8.15+ we can resume using Dockerfile.old or remove hack and use FROM node:8-slim
+FROM node:8.16.0-slim
 
-## Installing Node.js
-RUN gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D
-ENV NODE_VERSION 8.11.4
-ENV NODE_ENV production
-RUN set -eux; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends ca-certificates curl; \
-	rm -rf /var/lib/apt/lists/*; \
-	curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz"; \
-	curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc"; \
-	gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc; \
-	grep " node-v$NODE_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt | sha256sum -c -; \
-	tar -xf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 --no-same-owner; \
-	rm "node-v$NODE_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc SHASUMS256.txt; \
-	npm cache clear --force
-## End Hack
-
-## Actual Rocket.Chat stuff
+# crafted and tuned by pierre@ozoux.net and sing.li@rocket.chat
 LABEL maintainer="buildmaster@rocket.chat"
 
 RUN groupadd -r rocketchat \