diff --git a/nextcloud/defaults/main.yml b/nextcloud/defaults/main.yml
index 7de5d79..5fc38f9 100644
--- a/nextcloud/defaults/main.yml
+++ b/nextcloud/defaults/main.yml
@@ -6,8 +6,9 @@ nextcloud_use_redis: True
 nextcloud_use_memcache: False
 nextcloud_web_basedir: /var/www
 nextcloud_web_root: '{{ nextcloud_web_basedir }}/nextcloud'
-nextcloud_data_dir: /srv/nextcloud/data
-nextcloud_oc_dir: /srv/nextcloud/oc_keys
+nextcloud_data_base_dir: /srv
+nextcloud_data_dir: '{{ nextcloud_data_base_dir }}/nextcloud/data'
+nextcloud_oc_dir: '{{ nextcloud_data_base_dir }}/nextcloud/oc_keys'
 nextcloud_servername: '{{ ansible_fqdn }}'
 nextcloud_servernames:
   - { webroot: '{{ nextcloud_web_root }}', id: 1, name: '{{ nextcloud_servername }}' }
diff --git a/nextcloud/meta/main.yml b/nextcloud/meta/main.yml
index 08d6aa0..4be987f 100644
--- a/nextcloud/meta/main.yml
+++ b/nextcloud/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - { role: '../../library/roles/postgresql', when: psql_postgresql_install }
+  - { role: '../../library/roles/postgresql' }
   - { role: '../../library/roles/php-fpm' }
   - { role: '../../library/roles/nginx' }
   - { role: '../../library/roles/redis', when nextcloud_use_redis }