diff --git a/.docker/develop/Dockerfile b/.docker/develop/Dockerfile
index 81db355aa7f..15aa19a7a0d 100644
--- a/.docker/develop/Dockerfile
+++ b/.docker/develop/Dockerfile
@@ -22,10 +22,10 @@ WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads \
-    HOME=/tmp
+    Accounts_AvatarStorePath=/app/uploads
 
 EXPOSE 3000
 
diff --git a/.docker/latest/Dockerfile b/.docker/latest/Dockerfile
index e5f1ba34462..91e7b43dfd2 100644
--- a/.docker/latest/Dockerfile
+++ b/.docker/latest/Dockerfile
@@ -22,10 +22,10 @@ WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads \
-    HOME=/tmp
+    Accounts_AvatarStorePath=/app/uploads
 
 EXPOSE 3000