diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile
index ec3f25b..1fbdb20 100644
--- a/nodebb/Dockerfile
+++ b/nodebb/Dockerfile
@@ -15,21 +15,20 @@ VOLUME $BB_CONTENT
 
 RUN set -ex \
     && apk add -U bash \
+                  icu \
                   imagemagick \
-                  krb5-libs \
                   nodejs \
                   nodejs-npm \
                   openssl \
     && apk add -t TMP build-base \
                       curl \
                       git \
-                      krb5-dev \
+                      icu-dev \
                       openssl-dev \
                       python \
                       tar \
     && curl -sSL $BB_URL | tar xz --strip 1 \
-    && npm install --production \
-    && npm cache clean \
+    && ./nodebb setup \
     && apk del TMP \
     && rm -rf /tmp/npm* \
               /var/cache/apk/*
diff --git a/nodebb/arm/Dockerfile b/nodebb/arm/Dockerfile
index 5a5c1d4..1e316e3 100644
--- a/nodebb/arm/Dockerfile
+++ b/nodebb/arm/Dockerfile
@@ -15,21 +15,20 @@ VOLUME $BB_CONTENT
 
 RUN set -ex \
     && apk add -U bash \
+                  icu \
                   imagemagick \
-                  krb5-libs \
                   nodejs \
                   nodejs-npm \
                   openssl \
     && apk add -t TMP build-base \
                       curl \
                       git \
-                      krb5-dev \
+                      icu-dev \
                       openssl-dev \
                       python \
                       tar \
     && curl -sSL $BB_URL | tar xz --strip 1 \
-    && npm install --production \
-    && npm cache clean \
+    && ./nodebb setup \
     && apk del TMP \
     && rm -rf /tmp/npm* \
               /var/cache/apk/*