diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile
index 8a7f4ac..9fffa1e 100644
--- a/nodebb/Dockerfile
+++ b/nodebb/Dockerfile
@@ -5,10 +5,9 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV BB_VER=1.19.0
-ENV BB_URL=https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz
-ENV BB_DIR=/opt/nodebb
-ENV NODE_ENV=production
+ARG BB_VER=2.2.4
+ARG BB_URL=https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz
+ARG BB_DIR=/opt/nodebb
 
 WORKDIR $BB_DIR
 
@@ -27,8 +26,8 @@ RUN set -ex \
                       python3 \
                       tar \
     && curl -sSL $BB_URL | tar xz --strip 1 \
-    && curl -sSL https://github.com/NodeBB/NodeBB/raw/v1.19.0/install/package.json > package.json \
-    && npm install \
+    && curl -sSL https://github.com/NodeBB/NodeBB/raw/v$BB_VER/install/package.json > package.json \
+    && npm install --production \
     && apk del TMP \
     && rm -rf /tmp/npm* \
               /var/cache/apk/*
@@ -37,6 +36,7 @@ VOLUME $BB_DIR/config \
        $BB_DIR/build \
        $BB_DIR/public/uploads
 
+ENV NODE_ENV=production
 ENV silent=false
 ENV daemon=false
 
diff --git a/nodebb/Dockerfile.debian b/nodebb/Dockerfile.debian
index 03c9c86..2ecf240 100644
--- a/nodebb/Dockerfile.debian
+++ b/nodebb/Dockerfile.debian
@@ -5,8 +5,9 @@
 FROM debian:bullseye
 MAINTAINER EasyPi Software Foundation
 
-ENV BB_VER=1.19.0
-ENV BB_URL=https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz
+ARG BB_VER=2.2.4
+ARG BB_URL=https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz
+
 ENV BB_SOURCE=/usr/src/nodebb
 ENV BB_CONTENT=/var/lib/nodebb