diff --git a/file-server/Dockerfile b/file-server/Dockerfile
index 9334353..a7a9785 100644
--- a/file-server/Dockerfile
+++ b/file-server/Dockerfile
@@ -2,6 +2,8 @@ FROM node:20-alpine
 
 ARG TAG
 
+RUN npm install -g npm
+
 WORKDIR /usr/src/flowforge-file-server
 RUN mkdir app bin etc var
 COPY package.json /usr/src/flowforge-file-server/app
diff --git a/flowforge-docker-local-dev/Dockerfile b/flowforge-docker-local-dev/Dockerfile
index 06a8d55..d2225f7 100644
--- a/flowforge-docker-local-dev/Dockerfile
+++ b/flowforge-docker-local-dev/Dockerfile
@@ -1,6 +1,9 @@
-FROM node:16-alpine
+FROM node:20-alpine
 
 ARG REGISTRY
+
+RUN npm install -g npm
+
 RUN if [[ ! -z "$REGISTRY" ]] ; then npm config set @flowforge:registry "$REGISTRY"; fi
 
 RUN apk add --no-cache --virtual build-base g++ make py3-pip sqlite-dev python2
diff --git a/flowforge-docker/Dockerfile b/flowforge-docker/Dockerfile
index 1de44a7..7372c06 100644
--- a/flowforge-docker/Dockerfile
+++ b/flowforge-docker/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:20-alpine
 
 RUN apk add --no-cache --virtual build-base g++ make py3-pip sqlite-dev python3 git
+RUN npm install -g npm
 
 WORKDIR /usr/src/forge
 RUN mkdir app bin etc var
diff --git a/node-red-container/Dockerfile b/node-red-container/Dockerfile
index 69255ed..f6cef62 100644
--- a/node-red-container/Dockerfile
+++ b/node-red-container/Dockerfile
@@ -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