diff --git a/admin-compliance/Dockerfile b/admin-compliance/Dockerfile
index 6fb0577..f50b764 100644
--- a/admin-compliance/Dockerfile
+++ b/admin-compliance/Dockerfile
@@ -36,8 +36,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/developer-portal/Dockerfile b/developer-portal/Dockerfile
index 20267ee..0bcfd53 100644
--- a/developer-portal/Dockerfile
+++ b/developer-portal/Dockerfile
@@ -24,8 +24,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