diff --git a/images/open5gs-dbctl/Dockerfile b/images/open5gs-dbctl/Dockerfile
index 9f27d09..ba88ebd 100644
--- a/images/open5gs-dbctl/Dockerfile
+++ b/images/open5gs-dbctl/Dockerfile
@@ -1,16 +1,24 @@
 FROM mongo:latest
 
 ARG version
-ENV VERSION=$version
+ENV VERSION=$version \
+    USER=open5gs \
+    GROUP=open5gs
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive \
     apt-get install -y wget && \
     apt-get clean
+
 RUN wget -O /usr/local/bin/open5gs-dbctl https://github.com/open5gs/open5gs/raw/main/misc/db/open5gs-dbctl && \
     chmod +x /usr/local/bin/open5gs-dbctl
 
+RUN groupadd -r $GROUP && \
+useradd --comment "open5gs" --shell /bin/bash -M -r -g $GROUP $USER
+RUN chown -R $GROUP:$USER /usr/local/bin/open5gs-dbctl
+USER open5gs
+
 ENTRYPOINT ["bin/bash", "-c"]
 
 CMD ["/usr/local/bin/open5gs-dbctl"]
diff --git a/images/open5gs-webui/Dockerfile b/images/open5gs-webui/Dockerfile
index 7b4c0f3..d7751fb 100644
--- a/images/open5gs-webui/Dockerfile
+++ b/images/open5gs-webui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.10.0-bullseye as dev
+FROM node:20.10.0-bullseye AS dev
 LABEL maintainer="cgiraldo@gradiant.org" \
       organization="gradiant.org"
 
@@ -19,8 +19,7 @@ RUN cd /opt/open5gs-${VERSION}/webui && npm install  && npm run build
 FROM node:20.10.0-bullseye-slim
 
 
-ENV VERSION=$version \
-    USER=open5gs \
+ENV USER=open5gs \
     GROUP=open5gs \
     DB_URI=mongodb://mongo/open5gs
 
@@ -33,5 +32,7 @@ WORKDIR /opt/open5gs-webui
 RUN npm run-script build
 ENV NODE_ENV=production
 ENV HOSTNAME="0.0.0.0"
+RUN chown -R $GROUP:$USER /opt/open5gs-webui/
+USER open5gs
 ENTRYPOINT ["node", "server/index.js"]