diff --git a/docker/pbs.Dockerfile b/docker/pbs.Dockerfile
index 116087d9..6171b07b 100644
--- a/docker/pbs.Dockerfile
+++ b/docker/pbs.Dockerfile
@@ -26,6 +26,11 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /app/target/release/commit-boost-pbs /usr/local/bin
+
+RUN groupadd -g 10001 commitboost && \
+  useradd -u 10001 -g commitboost -s /sbin/nologin commitboost
+USER commitboost
+
 ENTRYPOINT ["/usr/local/bin/commit-boost-pbs"]
 
 
diff --git a/docker/signer.Dockerfile b/docker/signer.Dockerfile
index de77cb0f..d26d679b 100644
--- a/docker/signer.Dockerfile
+++ b/docker/signer.Dockerfile
@@ -26,6 +26,11 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /app/target/release/commit-boost-signer /usr/local/bin
+
+RUN groupadd -g 10001 commitboost && \
+  useradd -u 10001 -g commitboost -s /sbin/nologin commitboost
+USER commitboost
+
 ENTRYPOINT ["/usr/local/bin/commit-boost-signer"]