diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml
index 54869af..987c409 100644
--- a/roles/nextcloud/tasks/install.yml
+++ b/roles/nextcloud/tasks/install.yml
@@ -81,13 +81,20 @@
   s3lph.nextcloud.config:
     webroot: /var/lib/nextcloud/webroot
     system:
-      trusted_domains: "{{ nextcloud_trusted_domains }}"
-      cli_baseurl: "{{ nextcloud_cli_baseurl }}"
       redis:
         host: "{{ nextcloud_redis_host }}"
         port: "{{ nextcloud_redis_port }}"
         dbindex: "{{ nextcloud_redis_dbindex }}"
         timeout: "{{ nextcloud_redis_timeout }}"
+
+- name: Set common Nextcloud options
+  become: true
+  become_user: www-data
+  s3lph.nextcloud.config:
+    webroot: /var/lib/nextcloud/webroot
+    system:
+      trusted_domains: "{{ nextcloud_trusted_domains }}"
+      cli_baseurl: "{{ nextcloud_cli_baseurl }}"
       memcache.local: '\OC\Memcache\Redis'
       memcache.distributed: '\OC\Memcache\Redis'
       memcache.locking: '\OC\Memcache\Redis'