diff --git a/file-server/Dockerfile b/file-server/Dockerfile
index 55c5b6ca..9442f208 100644
--- a/file-server/Dockerfile
+++ b/file-server/Dockerfile
@@ -3,6 +3,7 @@ FROM node:20-alpine
 ARG TAG
 
 RUN apk add --no-cache --virtual build-base g++ make py3-pip sqlite-dev python3
+RUN npm install -g npm
 # RUN npm config set python `which python3` --global
 
 WORKDIR /usr/src/flowforge-file-server
diff --git a/flowforge-container/Dockerfile b/flowforge-container/Dockerfile
index 634da59e..5fe77035 100644
--- a/flowforge-container/Dockerfile
+++ b/flowforge-container/Dockerfile
@@ -3,6 +3,7 @@ FROM node:20-alpine
 ARG TAG
 
 RUN apk add --no-cache --virtual build-base g++ make py3-pip sqlite-dev python3 git
+RUN npm install -g npm
 # RUN npm config set python `which python3` --global
 
 WORKDIR /usr/src/forge
diff --git a/node-red-container/Dockerfile-3.1 b/node-red-container/Dockerfile-3.1
index 6c9fafce..3abbee88 100644
--- a/node-red-container/Dockerfile-3.1
+++ b/node-red-container/Dockerfile-3.1
@@ -2,6 +2,12 @@ FROM nodered/node-red:3.1.15-18
 
 ARG BUILD_TAG=latest
 
+USER root
+RUN npm install -g npm
+RUN chown -R 1000:1000 "/data/.npm"
+
+USER node-red
+
 COPY healthcheck.js /healthcheck.js
 
 COPY package.json /data
diff --git a/node-red-container/Dockerfile-4.0 b/node-red-container/Dockerfile-4.0
index 36a69f89..8a3a9fd4 100644
--- a/node-red-container/Dockerfile-4.0
+++ b/node-red-container/Dockerfile-4.0
@@ -2,6 +2,12 @@ FROM nodered/node-red:4.0.9-20
 
 ARG BUILD_TAG=latest
 
+USER root
+RUN npm install -g npm
+RUN chown -R 1000:1000 "/data/.npm"
+
+USER node-red
+
 COPY healthcheck.js /healthcheck.js
 
 COPY package.json /data
diff --git a/node-red-container/Dockerfile-4.1 b/node-red-container/Dockerfile-4.1
index 4ef7ce54..ec4dc983 100644
--- a/node-red-container/Dockerfile-4.1
+++ b/node-red-container/Dockerfile-4.1
@@ -2,6 +2,12 @@ FROM nodered/node-red:4.1.7-22
 
 ARG BUILD_TAG=latest
 
+USER root
+RUN npm install -g npm
+RUN chown -R 1000:1000 "/data/.npm"
+
+USER node-red
+
 COPY healthcheck.js /healthcheck.js
 
 COPY package.json /data