diff --git a/infrastructure/services/dufs/docker-compose.dufs.yml b/infrastructure/services/dufs/docker-compose.dufs.yml
index bda49e2..3569e9a 100644
--- a/infrastructure/services/dufs/docker-compose.dufs.yml
+++ b/infrastructure/services/dufs/docker-compose.dufs.yml
@@ -5,7 +5,7 @@ services:
     container_name: dufs
     profiles:
       - dufs
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     restart: on-failure:5
     depends_on:
       - caddy
diff --git a/infrastructure/services/forgejo/docker-compose.forgejo.yml b/infrastructure/services/forgejo/docker-compose.forgejo.yml
index 75558a1..de3b747 100644
--- a/infrastructure/services/forgejo/docker-compose.forgejo.yml
+++ b/infrastructure/services/forgejo/docker-compose.forgejo.yml
@@ -1,7 +1,7 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:13-rootless
+    image: codeberg.org/forgejo/forgejo:13
     container_name: forgejo
     profiles:
       - forgejo
@@ -14,13 +14,12 @@ services:
     env_file:
       - ./env/forgejo.env
     volumes:
-      - forgejo_data:/var/lib/gitea
-      - forgejo_config:/etc/gitea
+      - forgejo_data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
       - infra-network
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     security_opt:
       - no-new-privileges:true
   
@@ -73,7 +72,7 @@ services:
     container_name: 'forgejo_runner'
     env_file:
       - ./env/forgejo_runner.env
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     volumes:
 #      - ./config/forgejo_runner/config.yaml:/config.yaml:ro
       - forgejo_runner:/data
@@ -86,8 +85,6 @@ services:
 volumes:
   forgejo_data:
     name: forgejo_data
-  forgejo_config:
-    name: forgejo_config
   forgejo_db:
     name: forgejo_db
   forgejo_certs:
diff --git a/infrastructure/services/openssh/docker-compose.openssh.yml b/infrastructure/services/openssh/docker-compose.openssh.yml
index 3a3af40..fa1328b 100644
--- a/infrastructure/services/openssh/docker-compose.openssh.yml
+++ b/infrastructure/services/openssh/docker-compose.openssh.yml
@@ -31,7 +31,6 @@ services:
       - minecraft_proxy_data:/minecraft_proxy_data:rw
       - minecraft_rcon_data:/minecraft_rcon_data:rw
       - forgejo_data:/forgejo_data:rw
-      - forgejo_config:/forgejo_config:rw
       - forgejo_db:/forgejo_db:rw
       - teamfortress2_backup:/teamfortress2_backup:rw
       - teamfortress2_data:/teamfortress2_data:rw
@@ -88,7 +87,5 @@ volumes:
 # forgejo
   forgejo_data:
     name: forgejo_data
-  forgejo_config:
-    name: forgejo_config
   forgejo_db:
     name: forgejo_db
diff --git a/infrastructure/services/psitransfer/docker-compose.psitransfer.yml b/infrastructure/services/psitransfer/docker-compose.psitransfer.yml
index e6bcd5e..3ed3b66 100644
--- a/infrastructure/services/psitransfer/docker-compose.psitransfer.yml
+++ b/infrastructure/services/psitransfer/docker-compose.psitransfer.yml
@@ -6,7 +6,7 @@ services:
     profiles:
       - psitransfer
     restart: on-failure:5
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file: