diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile
index 920f9cc2..98fb9cde 100644
--- a/build/bench/Dockerfile
+++ b/build/bench/Dockerfile
@@ -85,8 +85,8 @@ RUN bash -c "bench --version"
 # https://nodejs.org/download/release/latest-v10.x/
 # https://nodejs.org/download/release/latest-v12.x/
 # https://nodejs.org/download/release/latest-v13.x/
-ENV NODE_VERSION=12.18.2
-ENV NODE_VERSION_FRAPPEV11=10.21.0
+ENV NODE_VERSION=12.20.0
+ENV NODE_VERSION_FRAPPEV11=10.23.0
 
 # Install nvm with node
 RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh
diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile
index 191d72bf..9e23fa29 100644
--- a/build/frappe-nginx/Dockerfile
+++ b/build/frappe-nginx/Dockerfile
@@ -5,7 +5,7 @@
 FROM bitnami/python:3.7-prod
 
 ENV NVM_DIR=/root/.nvm
-ENV NODE_VERSION=12.18.3
+ENV NODE_VERSION=12.20.0
 ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 RUN install_packages wget \
     && wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh \
diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile
index 948836cf..77777d58 100644
--- a/build/frappe-worker/Dockerfile
+++ b/build/frappe-worker/Dockerfile
@@ -1,11 +1,14 @@
 FROM bitnami/python:3.7-prod
 
-RUN useradd -ms /bin/bash frappe
+# Add non root user without password
+RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    -1/' /etc/login.defs \
+    && sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS    -1/' /etc/login.defs \
+    && useradd -ms /bin/bash frappe
 
 ARG GIT_BRANCH=develop
 ENV PYTHONUNBUFFERED 1
 ENV NVM_DIR=/home/frappe/.nvm
-ENV NODE_VERSION=12.18.3
+ENV NODE_VERSION=12.20.0
 ENV PATH="/home/frappe/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 
 # Install dependencies