diff --git a/admin-lehrer/Dockerfile b/admin-lehrer/Dockerfile
index 7fda5b0..4337dc2 100644
--- a/admin-lehrer/Dockerfile
+++ b/admin-lehrer/Dockerfile
@@ -34,8 +34,8 @@ WORKDIR /app
 ENV NODE_ENV=production
 
 # Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup -S -g 1001 nodejs
+RUN adduser -S -u 1001 -G nodejs nextjs
 
 # Copy built assets
 COPY --from=builder /app/public ./public
diff --git a/studio-v2/Dockerfile b/studio-v2/Dockerfile
index 5937223..2184794 100644
--- a/studio-v2/Dockerfile
+++ b/studio-v2/Dockerfile
@@ -31,8 +31,8 @@ WORKDIR /app
 ENV NODE_ENV=production
 
 # Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup -S -g 1001 nodejs
+RUN adduser -S -u 1001 -G nodejs nextjs
 
 # Copy built application
 COPY --from=builder /app/public ./public
diff --git a/website/Dockerfile b/website/Dockerfile
index a4a1735..0221c98 100644
--- a/website/Dockerfile
+++ b/website/Dockerfile
@@ -34,8 +34,8 @@ WORKDIR /app
 ENV NODE_ENV=production
 
 # Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup -S -g 1001 nodejs
+RUN adduser -S -u 1001 -G nodejs nextjs
 
 # Copy built assets
 COPY --from=builder /app/public ./public