diff --git a/.config/zz-docker.config.php b/.config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/.config/zz-docker.config.php
+++ b/.config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.08/apache/Dockerfile b/2024.08/apache/Dockerfile
index e0f4958..dcf86d2 100644
--- a/2024.08/apache/Dockerfile
+++ b/2024.08/apache/Dockerfile
@@ -149,11 +149,7 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
     } > /etc/apache2/conf-available/remoteip.conf; \
     a2enconf remoteip;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.08/apache/config/zz-docker.config.php b/2024.08/apache/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.08/apache/config/zz-docker.config.php
+++ b/2024.08/apache/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.08/fpm-alpine/Dockerfile b/2024.08/fpm-alpine/Dockerfile
index 68a129f..cefcbb7 100644
--- a/2024.08/fpm-alpine/Dockerfile
+++ b/2024.08/fpm-alpine/Dockerfile
@@ -128,16 +128,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.08/fpm-alpine/config/zz-docker.config.php b/2024.08/fpm-alpine/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.08/fpm-alpine/config/zz-docker.config.php
+++ b/2024.08/fpm-alpine/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.08/fpm/Dockerfile b/2024.08/fpm/Dockerfile
index 3f57f54..0fa07fa 100644
--- a/2024.08/fpm/Dockerfile
+++ b/2024.08/fpm/Dockerfile
@@ -149,16 +149,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.08/fpm/config/zz-docker.config.php b/2024.08/fpm/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.08/fpm/config/zz-docker.config.php
+++ b/2024.08/fpm/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.12/apache/Dockerfile b/2024.12/apache/Dockerfile
index b20f33a..7229eeb 100644
--- a/2024.12/apache/Dockerfile
+++ b/2024.12/apache/Dockerfile
@@ -149,11 +149,7 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
     } > /etc/apache2/conf-available/remoteip.conf; \
     a2enconf remoteip;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.12/apache/config/zz-docker.config.php b/2024.12/apache/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.12/apache/config/zz-docker.config.php
+++ b/2024.12/apache/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.12/fpm-alpine/Dockerfile b/2024.12/fpm-alpine/Dockerfile
index 6ae1154..d2ea2d3 100644
--- a/2024.12/fpm-alpine/Dockerfile
+++ b/2024.12/fpm-alpine/Dockerfile
@@ -128,16 +128,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.12/fpm-alpine/config/zz-docker.config.php b/2024.12/fpm-alpine/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.12/fpm-alpine/config/zz-docker.config.php
+++ b/2024.12/fpm-alpine/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2024.12/fpm/Dockerfile b/2024.12/fpm/Dockerfile
index bda14b7..c65549c 100644
--- a/2024.12/fpm/Dockerfile
+++ b/2024.12/fpm/Dockerfile
@@ -149,16 +149,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2024.12/fpm/config/zz-docker.config.php b/2024.12/fpm/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2024.12/fpm/config/zz-docker.config.php
+++ b/2024.12/fpm/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2025.02-dev/apache/Dockerfile b/2025.02-dev/apache/Dockerfile
index ef8224c..ff9d015 100644
--- a/2025.02-dev/apache/Dockerfile
+++ b/2025.02-dev/apache/Dockerfile
@@ -149,11 +149,7 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
     } > /etc/apache2/conf-available/remoteip.conf; \
     a2enconf remoteip;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2025.02-dev/apache/config/zz-docker.config.php b/2025.02-dev/apache/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2025.02-dev/apache/config/zz-docker.config.php
+++ b/2025.02-dev/apache/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2025.02-dev/fpm-alpine/Dockerfile b/2025.02-dev/fpm-alpine/Dockerfile
index 5b6e2e7..7ad08aa 100644
--- a/2025.02-dev/fpm-alpine/Dockerfile
+++ b/2025.02-dev/fpm-alpine/Dockerfile
@@ -128,16 +128,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2025.02-dev/fpm-alpine/config/zz-docker.config.php b/2025.02-dev/fpm-alpine/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2025.02-dev/fpm-alpine/config/zz-docker.config.php
+++ b/2025.02-dev/fpm-alpine/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/2025.02-dev/fpm/Dockerfile b/2025.02-dev/fpm/Dockerfile
index b57b3a9..adac5bb 100644
--- a/2025.02-dev/fpm/Dockerfile
+++ b/2025.02-dev/fpm/Dockerfile
@@ -149,16 +149,17 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 RUN set -ex; \
     echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/2025.02-dev/fpm/config/zz-docker.config.php b/2025.02-dev/fpm/config/zz-docker.config.php
index 946fe81..7a0d798 100644
--- a/2025.02-dev/fpm/config/zz-docker.config.php
+++ b/2025.02-dev/fpm/config/zz-docker.config.php
@@ -16,7 +16,7 @@
 		'loglevel' => 'notice',
 	],
 	'storage' => [
-		'filesystem_path' => '/var/www/html/storage',
+		'filesystem_path' => '/var/www/data',
 	],
 ];
 
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index c5304d1..a74cc05 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -127,15 +127,16 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 %%VARIANT_EXTRAS%%
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 6793878..8b8d9b2 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -148,15 +148,16 @@ RUN set -ex; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chown -R www-data:root /var/www; \
-    chmod -R g=u /var/www
+    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 %%VARIANT_EXTRAS%%
 
+RUN set -ex; \
+    mkdir -p -m 775 /var/www/data; \
+    chown -R www-data:www-data /var/www/data
+
 VOLUME /var/www/html
+VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39