diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47aaf433d..44f96784d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1024,7 +1024,7 @@ workflows:
             - team-broker-snyk
           requires:
             - Scan repository for secrets
-          additional_arguments: "--build-arg BASE_IMAGE=ubuntu:24.04"
+          additional_arguments: "--build-arg BASE_IMAGE=ubuntu:24.04 --build-arg USER_UID=2000"
           dockerfile: dockerfiles/base/Dockerfile
           nodejs_cycle: "23"
           project_name: broker-nlatest
diff --git a/dockerfiles/base/Dockerfile b/dockerfiles/base/Dockerfile
index 7eaedfc4f..f4d8116eb 100644
--- a/dockerfiles/base/Dockerfile
+++ b/dockerfiles/base/Dockerfile
@@ -8,11 +8,13 @@ ARG NODE_VERSION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV NODE_VERSION=${NODE_VERSION}
 ENV PATH=$PATH:/home/node/.npm-global/bin
+ARG USER_UID=1000
+ARG USER_GID=${USER_UID}
 
 RUN <<EOF
     set -ex
-    groupadd --gid 1000 node
-    useradd --uid 1000 --gid node --shell /bin/bash --create-home node
+    groupadd --gid ${USER_GID} node
+    useradd --uid ${USER_UID} --gid node --shell /bin/bash --create-home node
     apt update
     apt upgrade --assume-yes
     # install packages needed for node installation