diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 2a67421..5caa76f 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -502,3 +502,16 @@ homarr:
   volumes:
     configs: "{{docker_dir}}/homarr/configs"
     icons: "{{docker_dir}}/homarr/icons"
+
+#
+# gitea
+#
+
+gitea:
+  host: "git"
+  volumes:
+    data: "{{ docker_data_dir }}/gitea/data"
+    config: "{{ docker_dir }}/gitea/config"
+  ports:
+    http: "3000"
+    ssh: "2222"
diff --git a/roles/docker/tasks/aya01_compose.yml b/roles/docker/tasks/aya01_compose.yml
index dc4876f..654767e 100644
--- a/roles/docker/tasks/aya01_compose.yml
+++ b/roles/docker/tasks/aya01_compose.yml
@@ -86,3 +86,7 @@
 - include_tasks: jellyfin.yml
   tags:
     - jellyfin
+
+- include_tasks: gitea.yml
+  tags:
+    - gitea
diff --git a/roles/docker/tasks/gitea.yml b/roles/docker/tasks/gitea.yml
new file mode 100644
index 0000000..8645582
--- /dev/null
+++ b/roles/docker/tasks/gitea.yml
@@ -0,0 +1,12 @@
+
+- name: Create gitea directories
+  file:
+    path: "{{ item }}"
+    owner: "{{ puid }}"
+    group: "{{ pgid }}"
+    mode: '755'
+    state: directory
+  become: yes
+  loop:
+    - "{{ gitea.volumes.data }}"
+    - "{{ gitea.volumes.config }}"
diff --git a/roles/docker/templates/aya01/compose.yaml b/roles/docker/templates/aya01/compose.yaml
index 806264d..11acd67 100644
--- a/roles/docker/templates/aya01/compose.yaml
+++ b/roles/docker/templates/aya01/compose.yaml
@@ -412,8 +412,6 @@ services:
       - broker
     networks:
       - net
-    ports:
-      - "{{ paperless.port }}:{{ paperless.port }}"
     healthcheck:
       test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:{{ paperless.port }}"]
       interval: 30s
@@ -447,6 +445,24 @@ services:
       - {{ homarr.volumes.configs }}:/app/data/configs
       - {{ homarr.volumes.icons }}:/app/public/icons
 
+
+  {{ gitea.host }}:
+    container_name: {{ gitea.host }}
+    image: gitea/gitea:1.20.5-rootless
+    restart: unless-stopped
+    depends_on:
+      - pihole
+    networks:
+      - net
+    volumes:
+      - {{ gitea.volumes.data }}:/var/lib/gitea
+      - {{ gitea.volumes.config }}:/etc/gitea
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "{{ gitea.ports.http }}:3000"
+      - "{{ gitea.ports.ssh }}:2222"
+
 networks:
   zoneminder:
     driver: bridge
diff --git a/roles/samba/templates/smb.conf b/roles/samba/templates/smb.conf
index 296f1c0..178fe4f 100644
--- a/roles/samba/templates/smb.conf
+++ b/roles/samba/templates/smb.conf
@@ -4,9 +4,6 @@
     writable = no
     guest ok = no
     valid users = "@{{samba.group}}"
-    force create mode = 770
-    force directory mode = 770
-    inherit permissions = yes
 
 [{{ samba.shares.paperless.name }}]
     comment = {{ samba.shares.paperless.name }}
@@ -14,6 +11,4 @@
     writable = yes
     guest ok = no
     valid users = "@{{samba.group}}"
-    force create mode = 770
-    force directory mode = 770
-    inherit permissions = yes
+    create mask = 755