diff --git a/Dockerfile b/Dockerfile
index 248ac43..faa3731 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 FROM gitea/gitea:latest
 USER root
 RUN apk add --no-cache git-lfs && \
-    mkdir -p /.s6-svscan && \
-    chmod 777 /.s6-svscan
+    mkdir -p /.s6-svscan /var/run/s6 && \
+    chmod 777 /.s6-svscan && \
+    chmod 777 /var/run/s6
+# Keep git as runtime user
 USER git
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 195c18a..b1266b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
   gitea:
     container_name: gitea
     pull_policy: build
+    user: "1000:1000"
     build:
       context: .
       dockerfile: Dockerfile