diff --git a/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml b/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
index 40aad45..4839ba5 100644
--- a/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
+++ b/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
@@ -8,7 +8,7 @@
 
 - name: Create data directory
   ansible.builtin.file:
-    path: "/home/{{ ansible_user }}/forgejo/data"
+    path: "{{ compose_dir.path }}/data"
     state: directory
     mode: '0755'
   register: forgejo_data_dir
@@ -16,7 +16,7 @@
 
 - name: Create DB data directory
   ansible.builtin.file:
-    path: "/home/{{ ansible_user }}/forgejo/db"
+    path: "{{ compose_dir.path }}/db"
     state: directory
     mode: '0755'
   register: forgejo_db_dir
diff --git a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2 b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
index cf43b54..051f674 100644
--- a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
+++ b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
@@ -7,7 +7,8 @@ networks:
 
 services:
   server:
-    image: codeberg.org/forgejo/forgejo:16.0.1
+    image: codeberg.org/forgejo/forgejo:16.0.1-rootless
+    user: "{{ ansible_user_uid }}:{{ ansible_group_uid }}"
     container_name: forgejo
     restart: always
     environment:
@@ -26,11 +27,11 @@ services:
       - newt
       
     volumes:
-      - {{ forgejo_data_dir.path }}:/data
       - /etc/localtime:/etc/localtime:ro
+      - {{ forgejo_data_dir.path }}/gitea:/var/lib/gitea
     ports:
       - '3000:3000'
-      - '222:22'
+      - "222:2222"
 
     depends_on:
       - db
@@ -39,6 +40,7 @@ services:
   db:
     image: postgres:14
     restart: always
+    user: "{{ ansible_user_uid }}:{{ ansible_group_uid }}"
     environment:
       - POSTGRES_USER=forgejo
       - POSTGRES_PASSWORD={{ forgejo_db_password }}