diff --git a/scripts/entry.sh b/scripts/entry.sh
index c0b2dde45..398d46cc2 100755
--- a/scripts/entry.sh
+++ b/scripts/entry.sh
@@ -6,9 +6,14 @@ USER="root"
 # Run dockerd
 dockerd -s vfs &> /dev/null &
 
-# Setup local user
-if [ "${BUILDER_UID:-0}" -ne 0 ] && [ "${BUILDER_GID:-0}" -ne 0 ]; then
+
+# Setup local group, if not existing
+if [ "${BUILDER_GID:-0}" -ne 0 ] && ! getent group "${BUILDER_GID:-0}"; then
   groupadd -g "${BUILDER_GID}" builder
+fi
+
+# Setup local user
+if [ "${BUILDER_UID:-0}" -ne 0 ]; then
   useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder
   echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
   # Make sure cache is accessible by builder