diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 2dc06e15..bc0f6ab6 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -22,7 +22,8 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -43,4 +44,5 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index 49fafabc..8f8f807f 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -20,7 +20,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -35,7 +36,7 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     depends_on:
       - app
 
@@ -43,7 +44,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -51,4 +53,5 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
index defa0bdb..175ffab0 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -18,7 +18,8 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -28,4 +29,5 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index 3596e989..dbee3650 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     image: nextcloud:fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -30,10 +31,11 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     depends_on:
       - app
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index f69bb72e..44538af1 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -15,7 +15,8 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -25,4 +26,5 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 7a1fab7d..e709cb9a 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -13,7 +13,8 @@ services:
     image: nextcloud:fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -27,10 +28,11 @@ services:
     ports:
       - 8080:80
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     depends_on:
       - app
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
index 6d1e70a9..fb7d1c7b 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     image: nextcloud:fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -28,7 +29,7 @@ services:
     build: ./web
     restart: always
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     environment:
       - VIRTUAL_HOST=
     depends_on:
@@ -69,7 +70,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index b6ca391f..5276a149 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -20,7 +20,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -39,7 +40,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -76,7 +78,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index dd98915e..c6b9d1dc 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -20,7 +20,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -33,7 +34,7 @@ services:
     build: ./web
     restart: always
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -48,7 +49,8 @@ services:
     build: ./app
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -85,7 +87,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index 3b5121a6..42495160 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     image: nextcloud:apache
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -61,7 +62,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 17a656de..9af57646 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     image: nextcloud:fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -28,7 +29,7 @@ services:
     build: ./web
     restart: always
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -70,7 +71,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index a2bda83b..7fac5bbc 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -13,7 +13,8 @@ services:
     image: nextcloud:apache
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -58,7 +59,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 9bed1218..81001084 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -13,7 +13,8 @@ services:
     image: nextcloud:fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html
+      - nextcloud_html:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -25,7 +26,7 @@ services:
     build: ./web
     restart: always
     volumes:
-      - nextcloud:/var/www/html:ro
+      - nextcloud_html:/var/www/html:ro
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -67,7 +68,8 @@ services:
 
 volumes:
   db:
-  nextcloud:
+  nextcloud_html:
+  nextcloud_data:
   certs:
   vhost.d:
   html: