diff --git a/Dockerfile b/Dockerfile
index d6c63198280..be972ce9ac5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,16 @@ FROM node:0.10
 MAINTAINER buildmaster@rocket.chat 
 
 RUN groupadd -r rocketchat \
-&&  useradd -r -g rocketchat rocketchat
+&&  useradd -r -g rocketchat rocketchat \
+&&  mkdir /app
 
 # gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
 RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
 
+WORKDIR /app
 
-RUN mkdir /app \
-&&  cd /app \
-&&  curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
-&&  tar zxvf ./rocket.chat.tgz /app \
+RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
+&&  tar zxvf ./rocket.chat.tgz \
 &&  rm ./rocket.chat.tgz  \
 &&  cd /app/bundle/programs/server \
 &&  npm install