diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile
index 1fbdb20..2c6b689 100644
--- a/nodebb/Dockerfile
+++ b/nodebb/Dockerfile
@@ -37,4 +37,4 @@ COPY docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 4567
-CMD ["npm", "start"]
+CMD ["./nodebb", "start"]
diff --git a/nodebb/README.md b/nodebb/README.md
index 019a837..ee6a507 100644
--- a/nodebb/README.md
+++ b/nodebb/README.md
@@ -20,6 +20,7 @@ nodebb:
     - ./data:/var/lib/nodebb
     - /usr/src/nodebb/build
     - /usr/src/nodebb/node_modules
+    - /usr/src/nodebb/public/uploads
   restart: always
 
 redis:
@@ -47,9 +48,9 @@ $ firefox http://localhost:4567
 ```bash
 $ docker-compose pull nodebb
 $ docker-compose exec nodebb sh
->>> ./nodebb build
+>>> ./nodebb upgrade
 >>> exit
 ```
 
 [1]: https://nodebb.org/
-[2]: https://docs.nodebb.org/en/latest/
+[2]: https://docs.nodebb.org/
diff --git a/nodebb/arm/Dockerfile b/nodebb/arm/Dockerfile
index 1e316e3..008c4e9 100644
--- a/nodebb/arm/Dockerfile
+++ b/nodebb/arm/Dockerfile
@@ -37,4 +37,4 @@ COPY docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 4567
-CMD ["npm", "start"]
+CMD ["./nodebb", "start"]
diff --git a/nodebb/arm/docker-compose.yml b/nodebb/arm/docker-compose.yml
index fd3a6e9..5a7359f 100644
--- a/nodebb/arm/docker-compose.yml
+++ b/nodebb/arm/docker-compose.yml
@@ -8,6 +8,7 @@ nodebb:
     - ./data:/var/lib/nodebb
     - /usr/src/nodebb/build
     - /usr/src/nodebb/node_modules
+    - /usr/src/nodebb/public/uploads
   restart: always
 
 redis:
diff --git a/nodebb/arm/docker-entrypoint.sh b/nodebb/arm/docker-entrypoint.sh
index 98553fd..cd52095 100755
--- a/nodebb/arm/docker-entrypoint.sh
+++ b/nodebb/arm/docker-entrypoint.sh
@@ -5,7 +5,7 @@ export NODE_ENV=production
 export silent=false
 export daemon=false
 
-if [[ "$*" == npm*start* ]]; then
+if [[ "$*" == ./nodebb*start* ]]; then
     if [ ! -e "$BB_CONTENT/config.json" ]; then
         if [ -e "$BB_SOURCE/config.json" ]; then
             cp "$BB_SOURCE/config.json" "$BB_CONTENT/config.json"
diff --git a/nodebb/docker-compose.yml b/nodebb/docker-compose.yml
index 5466152..84a2304 100644
--- a/nodebb/docker-compose.yml
+++ b/nodebb/docker-compose.yml
@@ -8,6 +8,7 @@ nodebb:
     - ./data:/var/lib/nodebb
     - /usr/src/nodebb/build
     - /usr/src/nodebb/node_modules
+    - /usr/src/nodebb/public/uploads
   restart: always
 
 redis:
diff --git a/nodebb/docker-entrypoint.sh b/nodebb/docker-entrypoint.sh
index 98553fd..cd52095 100755
--- a/nodebb/docker-entrypoint.sh
+++ b/nodebb/docker-entrypoint.sh
@@ -5,7 +5,7 @@ export NODE_ENV=production
 export silent=false
 export daemon=false
 
-if [[ "$*" == npm*start* ]]; then
+if [[ "$*" == ./nodebb*start* ]]; then
     if [ ! -e "$BB_CONTENT/config.json" ]; then
         if [ -e "$BB_SOURCE/config.json" ]; then
             cp "$BB_SOURCE/config.json" "$BB_CONTENT/config.json"