diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
index 9868b60..f04efbf 100644
--- a/modules/events-processors/docker/Dockerfile
+++ b/modules/events-processors/docker/Dockerfile
@@ -3,17 +3,28 @@
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
-ARG USER_ID=1000
-ARG USER_GID=1000
+ARG USER_NAME="container_user"
+ARG USER_UID=1000
+ARG USER_GID=$USER_ID
 
-USER $USER_ID:$USER_GID
 
 ENV SERVER_DATA_DIR="/app/data" \
     KAFKA_STREAMS_STATE_DIR="/app/state/kafka"
 
+
 VOLUME ${SERVER_DATA_DIR} \
        ${KAFKA_STREAMS_STATE_DIR}
 
+
 COPY ${APP_FILES} /app/
 
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && chown -R $USER_UID:$USER_GID /app/
+
+
+USER $USER_ID:$USER_GID
+
+
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server-syslog/docker/Dockerfile b/modules/events-server-syslog/docker/Dockerfile
index 19c0a1a..1ad7691 100644
--- a/modules/events-server-syslog/docker/Dockerfile
+++ b/modules/events-server-syslog/docker/Dockerfile
@@ -3,21 +3,33 @@
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
-ARG USER_ID=1000
-ARG USER_GID=1000
+ARG USER_NAME="container_user"
+ARG USER_UID=1000
+ARG USER_GID=$USER_ID
 
-USER $USER_ID:$USER_GID
 
 ENV SERVER_DATA_DIR="/app/data" \
     KAFKA_STREAMS_STATE_DIR="/app/state/kafka" \
     SOCKET_SERVER_HOST=0.0.0.0 \
     SOCKET_SERVER_PORT=9002
 
+
 EXPOSE $SOCKET_SERVER_PORT
 
+
 VOLUME ${SERVER_DATA_DIR} \
        ${KAFKA_STREAMS_STATE_DIR}
 
+
 COPY ${APP_FILES} /app/
 
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && chown -R $USER_UID:$USER_GID /app/
+
+
+USER $USER_ID:$USER_GID
+
+
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server-web/docker/Dockerfile b/modules/events-server-web/docker/Dockerfile
index e767a17..b706a83 100644
--- a/modules/events-server-web/docker/Dockerfile
+++ b/modules/events-server-web/docker/Dockerfile
@@ -3,20 +3,32 @@
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
-ARG USER_ID=1000
-ARG USER_GID=1000
+ARG USER_NAME="container_user"
+ARG USER_UID=1000
+ARG USER_GID=$USER_ID
 
-USER $USER_ID:$USER_GID
 
 ENV SERVER_DATA_DIR="/app/data" \
     KAFKA_STREAMS_STATE_DIR="/app/state/kafka" \
     WEB_SERVER_PORT=80
 
+
 EXPOSE $WEB_SERVER_PORT
 
+
 VOLUME ${SERVER_DATA_DIR} \
        ${KAFKA_STREAMS_STATE_DIR}
 
+
 COPY ${APP_FILES} /app/
 
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && chown -R $USER_UID:$USER_GID /app/
+
+
+USER $USER_ID:$USER_GID
+
+
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server/docker/Dockerfile b/modules/events-server/docker/Dockerfile
index c8e9492..44fe964 100644
--- a/modules/events-server/docker/Dockerfile
+++ b/modules/events-server/docker/Dockerfile
@@ -2,23 +2,34 @@
 
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
-ARG APP_FILES="build/"
-ARG USER_ID=1000
-ARG USER_GID=1000
+ARG USER_NAME="container_user"
+ARG USER_UID=1000
+ARG USER_GID=$USER_ID
 
-USER $USER_ID:$USER_GID
 
 ENV SERVER_DATA_DIR="/app/data" \
     KAFKA_STREAMS_STATE_DIR="/app/state/kafka" \
     SERVER_PORT=8080 \
     SOCKET_SERVER_PORT=9002
 
+
 EXPOSE $SERVER_PORT \
        $SOCKET_SERVER_PORT
 
+
 VOLUME ${SERVER_DATA_DIR} \
        ${KAFKA_STREAMS_STATE_DIR}
 
+
 COPY ${APP_FILES} /app/
 
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && chown -R $USER_UID:$USER_GID /app/
+
+
+USER $USER_ID:$USER_GID
+
+
 ENTRYPOINT /app/bin/run