diff --git a/Dockerfile b/Dockerfile
index dadea22..aa574b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,7 @@ FROM library/docker:stable
 ENV HOME_DIR=/opt/crontab
 RUN apk add --no-cache --virtual .run-deps bash jq \
     && mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \
-    && adduser -S docker -D \
-    && sed -i "s/999/99/" /etc/group
+    && adduser -S docker -D
 
 COPY docker-entrypoint /
 ENTRYPOINT ["/docker-entrypoint"]
diff --git a/docker-entrypoint b/docker-entrypoint
index 9340698..0f40c90 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -25,8 +25,12 @@ mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
 # Create docker group using correct gid from host, and add docker user to it
 if ! grep -q "^docker:" /etc/group; then
 	DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
-	addgroup -g ${DOCKER_GID} docker
-	adduser docker docker
+	if [ "${DOCKER_GID}" != "0" ]; then
+        addgroup -g ${DOCKER_GID} docker
+        adduser docker docker
+	else
+	    adduser docker root
+	fi
 fi
 
 slugify() {