diff --git a/.docker/develop/Dockerfile b/.docker/develop/Dockerfile
index 7e3a46fa425..b34ae5e5a03 100644
--- a/.docker/develop/Dockerfile
+++ b/.docker/develop/Dockerfile
@@ -8,12 +8,13 @@ RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
  && gpg --verify rocket.chat.tgz.asc \
+ && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear \
- && chown rocketchat:rocketchat /app -R
+ && chown -R rocketchat:rocketchat /app
 
 USER rocketchat
 
@@ -23,7 +24,7 @@ WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
-	MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+    MONGO_OPLOG_URL=mongodb://mongo:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \
diff --git a/.docker/latest/Dockerfile b/.docker/latest/Dockerfile
index eac0369d9af..5b4ea1d9297 100644
--- a/.docker/latest/Dockerfile
+++ b/.docker/latest/Dockerfile
@@ -8,12 +8,13 @@ RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
  && gpg --verify rocket.chat.tgz.asc \
+ && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear \
- && chown rocketchat:rocketchat /app -R
+ && chown -R rocketchat:rocketchat /app
 
 USER rocketchat
 
@@ -23,6 +24,7 @@ WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
+    MONGO_OPLOG_URL=mongodb://mongo:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \