diff --git a/Dockerfile.agent b/Dockerfile.agent
index d19b806..1ec4c12 100644
--- a/Dockerfile.agent
+++ b/Dockerfile.agent
@@ -38,7 +38,7 @@ RUN echo '#!/bin/sh' > /app/entrypoint.sh && \
     chmod +x /app/entrypoint.sh
 
 # Create non-root user
-RUN addgroup -D appgroup && adduser -D appuser -G appgroup
+RUN addgroup -g 1000 appgroup && adduser -D -u 1000 -G appgroup appuser
 USER appuser
 
 # Run the agent
diff --git a/Dockerfile.server b/Dockerfile.server
index e97a4db..f63c9ba 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -42,7 +42,7 @@ RUN echo '#!/bin/sh' > /app/entrypoint.sh && \
     chmod +x /app/entrypoint.sh
 
 # Create non-root user
-RUN addgroup -D appgroup && adduser -D appuser -G appgroup
+RUN addgroup -g 1000 appgroup && adduser -D -u 1000 -G appgroup appuser
 USER appuser
 
 # Expose port