diff --git a/Dockerfile b/Dockerfile
index b19d4807e8a..e83bb990408 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ ENV NODE_ENV production
 ENV NODE_OPTIONS '--no-experimental-fetch'
 
 # App environment variables
-ENV DATABASE_URL "file:/app/data/db.sqlite"
+ENV DATABASE_URL "file:/data/db.sqlite"
 ENV NEXTAUTH_URL "http://localhost:7575"
 ENV NEXTAUTH_SECRET NOT_IN_USE_BECAUSE_JWTS_ARE_UNUSED
 
diff --git a/docker/entrypoint/docker-entrypoint.d/00-user-setup.sh b/docker/entrypoint/docker-entrypoint.d/00-user-setup.sh
index c7e1671aebf..80c0904199d 100755
--- a/docker/entrypoint/docker-entrypoint.d/00-user-setup.sh
+++ b/docker/entrypoint/docker-entrypoint.d/00-user-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOMARR_USER_PATHS="/app/data /app/public/icons"
+HOMARR_USER_PATHS="/app/data /app/public/icons /data"
 
 for path in $HOMARR_USER_PATHS
 do
@@ -21,6 +21,8 @@ groupmod -g $PGID homarr
 
 DOCKER_GID=$(stat -c %g /var/run/docker.sock 2>/dev/null)
 if [[ $? -eq 0 ]]; then
-	echo "SETTING DOCKER GID TO ${DOCKER_GID}"
-	groupmod -g $DOCKER_GID docker
+	if [[ $DOCKER_GID -ne 0 ]]; then
+		echo "SETTING DOCKER GID TO ${DOCKER_GID}"
+		groupmod -g $DOCKER_GID docker
+	fi
 fi
\ No newline at end of file