diff --git a/common/types/buf/Dockerfile b/common/types/buf/Dockerfile
index 77e2c303..e84945a4 100644
--- a/common/types/buf/Dockerfile
+++ b/common/types/buf/Dockerfile
@@ -5,17 +5,18 @@ RUN npm install -g ts-proto
 
 COPY --from=BUILDER /usr/local/bin /usr/local/bin
 
-# Inject user id and group id to avoid permission issues
+# Inject user id and group id to avoid permission issues when running as a root user
 ARG USER_ID=1000
 ARG USER_GID=1000
 
-# Create user and group if they don't exist
+# Create group if it doesn't exist
 RUN if ! getent group $USER_GID; then \
   addgroup -g $USER_GID mygroup; \
 fi
 
+# Create user if it doesn't exist
 RUN if ! getent passwd $USER_ID; then \
-  adduser -D -u $USER_ID -G mygroup myuser; \
+  adduser -D -u $USER_ID -G $(getent group $USER_GID | cut -d: -f1) myuser; \
 fi
 
 # Change to user