diff --git a/tasks/main.yml b/tasks/main.yml
index 82e45cf..0af7a4d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,10 +7,18 @@
     group: www-data
     creates: /var/www/nextcloud
 
+- name: create nextcloud datadir
+  file:
+    path: "{{ nextcloud.datadir }}"
+    owner: www-data
+    group: www-data
+    mode: 0770
+    state: directory
+
 - name: setup nextcloud
   become_user: www-data
   become: true
-  command: "/usr/bin/php occ maintenance:install -n --database 'mysql' --database-name '{{ nextcloud.db.name }}'  --database-user '{{ nextcloud.db.user }}' --database-pass '{{ nextcloud.db.pw }}' --admin-user '{{ nextcloud.admin.name }}' --admin-pass '{{ nextcloud.admin.pw }}'"
+  command: "/usr/bin/php occ maintenance:install -n --database 'mysql' --database-name '{{ nextcloud.db.name }}'  --database-user '{{ nextcloud.db.user }}' --database-pass '{{ nextcloud.db.pw }}' --admin-user '{{ nextcloud.admin.name }}' --admin-pass '{{ nextcloud.admin.pw }}' --data-dir '{{ nextcloud.datadir }}'"
   args:
     chdir: /var/www/nextcloud
     creates: /var/www/nextcloud/config/config.php
@@ -36,6 +44,7 @@
   - { key: "mail_smtphost",     value: "{{ mail.server }}" }
   - { key: "mail_smtpport",     value: "25" }
   - { key: "memcache.local",    value: '{{ "\OC\Memcache\APCu" }}' }
+  - { key: "datadirectory",     value: "{{ nextcloud.datadir }}" }
 
 - name: copy nextcloud nginx config
   template: