diff --git a/container-entrypoint b/container-entrypoint
index 8a41f02..e756e95 100755
--- a/container-entrypoint
+++ b/container-entrypoint
@@ -18,6 +18,8 @@ if [ $USER_ID == 0 ]; then
 	# We shall run everything as root
 	mkdir -p /builder
 
+	GOSU=""
+elif [ $USER_ID == $UID ]; then
 	GOSU=""
 else
 	if ! grep -q "^builder:" /etc/group; then