diff --git a/Dockerfile b/Dockerfile
index fa66e6c..c546f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,10 @@ FROM gitea/gitea:latest
 USER root
 RUN apk add --no-cache git-lfs && \
     mkdir -p /.s6-svscan/gitea/log && \
-    mkdir -p /var/run/s6 && \
+    mkdir -p /var/run/s6 /run && \
     touch /.s6-svscan/lock && \
     chmod -R 777 /.s6-svscan && \
-    chmod 777 /var/run/s6
+    chmod 777 /var/run/s6 && \
+    chmod 777 /run && \
+    chown -R git:git /data /run
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ad8093..b72378d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       context: .
       dockerfile: Dockerfile
     environment:
-      - USER=root
+      - USER=git
       - USER_UID=1000
       - USER_GID=1000
       # Core settings