diff --git a/ansible/roles/nextcloud/tasks/main.yml b/ansible/roles/nextcloud/tasks/main.yml
index cb43e5c..c9a7c67 100644
--- a/ansible/roles/nextcloud/tasks/main.yml
+++ b/ansible/roles/nextcloud/tasks/main.yml
@@ -1,3 +1,11 @@
+- name: Create service user
+  user:
+    name: "{{ role_name }}"
+    append: yes
+    system: true
+  register: service_user
+  become: true
+
 - name: Create install directory
   file:
     path: "{{ install_directory }}/{{ role_name }}"
diff --git a/ansible/roles/nextcloud/templates/docker-compose.yml b/ansible/roles/nextcloud/templates/docker-compose.yml
index d5c51f6..d7d62f4 100644
--- a/ansible/roles/nextcloud/templates/docker-compose.yml
+++ b/ansible/roles/nextcloud/templates/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       TZ: "{{ timezone }}"
     volumes:
       - "{{ data_dir }}/{{ role_name }}/config:/config"
-      - "{{ data_dir }}/{{ role_name }}/data:/data"
+      - "{{ media_storage_mnt }}/nextcloud:/data"
     labels:
       traefik.enable: true
       traefik.http.routers.nextcloud.rule: "Host(`{{ role_name }}.{{ personal_domain }}`)"