diff --git a/hbdg/Dockerfile b/hbdg/Dockerfile
index 9cadf39..3ce04d7 100644
--- a/hbdg/Dockerfile
+++ b/hbdg/Dockerfile
@@ -13,6 +13,7 @@ RUN set -xe \
                build-base \
                dbus \
                nodejs \
+               nodejs-npm \
                python \
     && npm install -g homebridge \
                       homebridge-homeassistant \
diff --git a/hbdg/arm/Dockerfile b/hbdg/arm/Dockerfile
index 2c6b19d..b621f6c 100644
--- a/hbdg/arm/Dockerfile
+++ b/hbdg/arm/Dockerfile
@@ -13,6 +13,7 @@ RUN set -xe \
                build-base \
                dbus \
                nodejs \
+               nodejs-npm \
                python \
     && npm install -g homebridge \
                       homebridge-homeassistant \
diff --git a/hubot/Dockerfile b/hubot/Dockerfile
index 1cab92f..371e578 100644
--- a/hubot/Dockerfile
+++ b/hubot/Dockerfile
@@ -11,7 +11,7 @@ ENV HUBOT_DESCRIPTION=$HUBOT_NAME-$HUBOT_ADAPTER
 ENV HUBOT_SLACK_TOKEN=
 
 RUN set -xe \
-    && apk add --update ca-certificates nodejs \
+    && apk add --update ca-certificates nodejs nodejs-npm \
     && npm install -g yo generator-hubot \
     && adduser -s /bin/sh -D hubot
 
diff --git a/hubot/arm/Dockerfile b/hubot/arm/Dockerfile
index d78bf00..a29ba1f 100644
--- a/hubot/arm/Dockerfile
+++ b/hubot/arm/Dockerfile
@@ -11,7 +11,7 @@ ENV HUBOT_DESCRIPTION=$HUBOT_NAME-$HUBOT_ADAPTER
 ENV HUBOT_SLACK_TOKEN=
 
 RUN set -xe \
-    && apk add --update ca-certificates nodejs \
+    && apk add --update ca-certificates nodejs nodejs-npm \
     && npm install -g yo generator-hubot \
     && adduser -s /bin/sh -D hubot
 
diff --git a/jamapi/Dockerfile b/jamapi/Dockerfile
index 1df58fd..fcbd7b3 100644
--- a/jamapi/Dockerfile
+++ b/jamapi/Dockerfile
@@ -8,7 +8,7 @@ MAINTAINER kev <noreply@easypi.pro>
 WORKDIR /app
 
 RUN set -xe \
-    && apk add -U ca-certificates curl nodejs tar \
+    && apk add -U ca-certificates curl nodejs nodejs-npm tar \
     && curl -sSL https://github.com/gavindinubilo/jam-api/archive/master.tar.gz | tar xz --strip 1 \
     && npm install --production \
     && apk del curl tar \
diff --git a/json-server/Dockerfile b/json-server/Dockerfile
index 4c4e33e..75159cf 100644
--- a/json-server/Dockerfile
+++ b/json-server/Dockerfile
@@ -8,7 +8,7 @@ MAINTAINER kev <noreply@easypi.pro>
 WORKDIR /app
 
 RUN set -xe \
-    && apk add -U nodejs \
+    && apk add --no-cache nodejs nodejs-npm \
     && npm install -g json-server \
     && rm -rf /tmp/npm* /var/cache/apk/*
 
diff --git a/netdata/Dockerfile b/netdata/Dockerfile
index 2ab109b..9b8e8bb 100644
--- a/netdata/Dockerfile
+++ b/netdata/Dockerfile
@@ -14,6 +14,7 @@ RUN set -xe \
                           build-base \
                           curl \
                           nodejs \
+                          nodejs-npm \
                           python \
                           libmnl \
                           libmnl-dev \
diff --git a/netdata/arm/Dockerfile b/netdata/arm/Dockerfile
index 4a7aa4c..5e4a040 100644
--- a/netdata/arm/Dockerfile
+++ b/netdata/arm/Dockerfile
@@ -14,6 +14,7 @@ RUN set -xe \
                           build-base \
                           curl \
                           nodejs \
+                          nodejs-npm \
                           python \
                           libmnl \
                           libmnl-dev \