diff --git a/Dockerfile b/Dockerfile
index b9b89bb..fc64d90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,18 @@
 FROM node:22
 
+ARG USER_ID
+ARG GROUP_ID
+ARG USER_NAME
+
+RUN userdel node
+RUN groupadd -g ${GROUP_ID} ${USER_NAME}
+RUN useradd \
+    -u ${USER_ID} \
+    -g ${GROUP_ID} \
+    --create-home \
+    --non-unique \
+    ${USER_NAME}
+
 WORKDIR /app
 RUN mkdir -p /output
 RUN chmod -R 777 /output
@@ -53,4 +66,6 @@ ADD package.json /app/package.json
 ADD package-lock.json /app/package-lock.json
 RUN npm install --quiet
 
+USER ${USER_ID}:${GROUP_ID}
+
 ADD . /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 38ab3b3..2323a1a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,12 @@
 services:
   webpack:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        USER_ID: ${UID:-1000}
+        GROUP_ID: ${GID:-1000}
+        USER_NAME: ${USER:-user}
     command: npx webpack --watch --config webpack.dev.js
     image: sbe_webpack:latest
     volumes: