diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile
index c7cfa95c..f884e7c9 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 7020b68a..16ab16bb 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.12RC1
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 7b7a6a1a..b168fb4e 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.12RC1
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 276ca47e..9302f02f 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 76b1f477..912bb569 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.7RC1
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 b8169616..3b93d980 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.7RC1
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 b3c799c9..cd567960 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 d99d5aff..28b25aeb 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.2RC1
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 0dfd45bc..08c78579 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.2RC1
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