diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index 9c45cdb..734906b 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -30,6 +30,8 @@
       - /home/{{ system_user_name }}/docker/gitea/db:/var/lib/mysql
     networks:
       - name: gitea_internal
+    ports:
+      - "{{ BORGMATIC_BACKUP_HOST }}:{{ BORGMATIC_GITEA_DB_PORT }}:{{GITEA_DB_PORT}}"
 
 - name: Create Gitea Container
   community.docker.docker_container:
@@ -42,6 +44,8 @@
       - '11004:3000'
       - '222:22'
     env:
+      USER_UID: "{{ system_user_uid }}"
+      USER_GID: "{{ system_user_gid }}"
       GITEA__database__DB_TYPE: "{{ GITEA_DB_TYPE | string}}"
       GITEA__database__HOST: "{{ GITEA_DB_HOST | string}}"
       GITEA__database__NAME: "{{ GITEA_DB_NAME | string }}"
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 4b05ce5..c047e59 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -30,6 +30,8 @@
       - /home/{{ system_user_name }}/docker/nextcloud/db:/var/lib/mysql
     networks:
       - name: nextcloud_internal
+    ports:
+      - "{{ BORGMATIC_BACKUP_HOST }}:{{ BORGMATIC_NEXTCLOUD_MYSQL_PORT }}:{{ NEXTCLOUD_MYSQL_PORT }}"
 
 - name: Create Nextcloud Redis Container
   community.docker.docker_container:
diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml
index 4b3d44b..ce6d3ad 100644
--- a/roles/npm/tasks/main.yml
+++ b/roles/npm/tasks/main.yml
@@ -30,6 +30,9 @@
       - /home/{{ system_user_name }}/docker/npm/db:/var/lib/mysql
     networks:
       - name: npm_internal
+    ports:
+      - "{{ BORGMATIC_BACKUP_HOST }}:{{ BORGMATIC_NPM_MYSQL_PORT }}:{{ NPM_MYSQL_PORT }}"
+
 
 - name: Create NPM Container
   community.docker.docker_container:
diff --git a/roles/wiki_js/tasks/main.yml b/roles/wiki_js/tasks/main.yml
index b8679b4..c53eccf 100644
--- a/roles/wiki_js/tasks/main.yml
+++ b/roles/wiki_js/tasks/main.yml
@@ -29,6 +29,8 @@
       - /home/{{ system_user_name }}/docker/wiki_js/db:/var/lib/postgresql/data
     networks:
       - name: wiki_js_internal
+    ports:
+      - "{{ BORGMATIC_BACKUP_HOST }}:{{ BORGMATIC_WIKI_JS_DB_PORT }}:{{ WIKI_JS_DB_PORT }}"
 
 - name: Create Wiki_JS Container
   community.docker.docker_container: