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..8081243e 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
@@ -23,6 +23,7 @@ services:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -44,3 +45,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..5b14bebd 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
@@ -21,6 +21,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -44,6 +45,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -52,3 +54,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..fdb564ee 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -29,3 +30,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..931b46dc 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -37,3 +38,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..5e2c7f04 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -26,3 +27,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..267f220e 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -14,6 +14,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -34,3 +35,4 @@ services:
 volumes:
   db:
   nextcloud:
+  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..b589daab 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
@@ -17,6 +17,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -70,6 +71,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..1e5cec62 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
@@ -21,6 +21,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -40,6 +41,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -77,6 +79,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..af6a2fef 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
@@ -21,6 +21,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -49,6 +50,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -86,6 +88,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..24e81973 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
@@ -17,6 +17,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -62,6 +63,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..d44a09e3 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
@@ -17,6 +17,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - MYSQL_HOST=db
     env_file:
@@ -71,6 +72,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..f34e3b6c 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
@@ -14,6 +14,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -59,6 +60,7 @@ services:
 volumes:
   db:
   nextcloud:
+  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..8587a544 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
@@ -14,6 +14,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+      - nextcloud_data:/var/nc_data
     environment:
       - POSTGRES_HOST=db
     env_file:
@@ -68,6 +69,7 @@ services:
 volumes:
   db:
   nextcloud:
+  nextcloud_data:
   certs:
   vhost.d:
   html:
diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile
index b72bb6e0..99b4785f 100644
--- a/12.0-rc/apache/Dockerfile
+++ b/12.0-rc/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/12.0-rc/apache/entrypoint.sh b/12.0-rc/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0-rc/apache/entrypoint.sh
+++ b/12.0-rc/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile
index 7f40aa93..a8addae3 100644
--- a/12.0-rc/fpm-alpine/Dockerfile
+++ b/12.0-rc/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 12.0.12RC2
diff --git a/12.0-rc/fpm-alpine/entrypoint.sh b/12.0-rc/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0-rc/fpm-alpine/entrypoint.sh
+++ b/12.0-rc/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile
index 5b996a29..da649b4c 100644
--- a/12.0-rc/fpm/Dockerfile
+++ b/12.0-rc/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 12.0.12RC2
diff --git a/12.0-rc/fpm/entrypoint.sh b/12.0-rc/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0-rc/fpm/entrypoint.sh
+++ b/12.0-rc/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index d656eddb..a61620aa 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0/apache/entrypoint.sh
+++ b/12.0/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 7bd6a8f2..4419d000 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 12.0.11
diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0/fpm-alpine/entrypoint.sh
+++ b/12.0/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index d01584d9..bbb3282c 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 12.0.11
diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/12.0/fpm/entrypoint.sh
+++ b/12.0/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile
index a97e2d7c..8ff00fc1 100644
--- a/13.0-rc/apache/Dockerfile
+++ b/13.0-rc/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/13.0-rc/apache/entrypoint.sh b/13.0-rc/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0-rc/apache/entrypoint.sh
+++ b/13.0-rc/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile
index f7428cea..52cc5053 100644
--- a/13.0-rc/fpm-alpine/Dockerfile
+++ b/13.0-rc/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 13.0.7RC2
diff --git a/13.0-rc/fpm-alpine/entrypoint.sh b/13.0-rc/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0-rc/fpm-alpine/entrypoint.sh
+++ b/13.0-rc/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile
index af1918d1..b7ec4f59 100644
--- a/13.0-rc/fpm/Dockerfile
+++ b/13.0-rc/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 13.0.7RC2
diff --git a/13.0-rc/fpm/entrypoint.sh b/13.0-rc/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0-rc/fpm/entrypoint.sh
+++ b/13.0-rc/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index f68de1cc..cf2fb3f2 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 7ad23620..84e1a836 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 13.0.6
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 3cb5837e..e9d59d51 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 13.0.6
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0-rc/apache/Dockerfile b/14.0-rc/apache/Dockerfile
index 24ec6ba9..baa3817e 100644
--- a/14.0-rc/apache/Dockerfile
+++ b/14.0-rc/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/14.0-rc/apache/entrypoint.sh b/14.0-rc/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0-rc/apache/entrypoint.sh
+++ b/14.0-rc/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0-rc/fpm-alpine/Dockerfile b/14.0-rc/fpm-alpine/Dockerfile
index fae5380f..36f4eb6d 100644
--- a/14.0-rc/fpm-alpine/Dockerfile
+++ b/14.0-rc/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 14.0.2RC2
diff --git a/14.0-rc/fpm-alpine/entrypoint.sh b/14.0-rc/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0-rc/fpm-alpine/entrypoint.sh
+++ b/14.0-rc/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0-rc/fpm/Dockerfile b/14.0-rc/fpm/Dockerfile
index 931119da..3fbf7780 100644
--- a/14.0-rc/fpm/Dockerfile
+++ b/14.0-rc/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 14.0.2RC2
diff --git a/14.0-rc/fpm/entrypoint.sh b/14.0-rc/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0-rc/fpm/entrypoint.sh
+++ b/14.0-rc/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index 67af2889..2465fe03 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 RUN a2enmod rewrite remoteip ;\
     {\
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index 5776d3d7..25a7df9d 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -80,11 +80,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 14.0.1
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index 91088ac7..d0e3e1da 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -91,11 +91,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 
 
 ENV NEXTCLOUD_VERSION 14.0.1
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 9bb6e9eb..bd9c2026 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -79,11 +79,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 %%VARIANT_EXTRAS%%
 
 ENV NEXTCLOUD_VERSION %%VERSION%%
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 54c28425..ffb24e59 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -90,11 +90,12 @@ RUN { \
     \
     echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    mkdir /var/nc_data; \
+    chown -R www-data:root /var/www /var/nc_data; \
+    chmod -R g=u /var/www /var/nc_data
 
 VOLUME /var/www/html
+VOLUME /var/nc_data
 %%VARIANT_EXTRAS%%
 
 ENV NEXTCLOUD_VERSION %%VERSION%%
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c1c106c1..0b081bfe 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
                     # shellcheck disable=SC2016
                     install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
+                else
+                    install_options=$install_options' --data-dir "/var/nc_data"'
                 fi
 
                 install=false