diff --git a/12.0-rc/apache/entrypoint.sh b/12.0-rc/apache/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0-rc/apache/entrypoint.sh
+++ b/12.0-rc/apache/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile
index 6d8434f1..adee0a8b 100644
--- a/12.0-rc/fpm-alpine/Dockerfile
+++ b/12.0-rc/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         rsync \
+        shadow \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
diff --git a/12.0-rc/fpm-alpine/entrypoint.sh b/12.0-rc/fpm-alpine/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0-rc/fpm-alpine/entrypoint.sh
+++ b/12.0-rc/fpm-alpine/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/12.0-rc/fpm/entrypoint.sh b/12.0-rc/fpm/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0-rc/fpm/entrypoint.sh
+++ b/12.0-rc/fpm/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0/apache/entrypoint.sh
+++ b/12.0/apache/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 9cb14277..498f7447 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         rsync \
+        shadow \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0/fpm-alpine/entrypoint.sh
+++ b/12.0/fpm-alpine/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/12.0/fpm/entrypoint.sh
+++ b/12.0/fpm/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0-rc/apache/entrypoint.sh b/13.0-rc/apache/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0-rc/apache/entrypoint.sh
+++ b/13.0-rc/apache/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile
index 86510f2f..5c4cad00 100644
--- a/13.0-rc/fpm-alpine/Dockerfile
+++ b/13.0-rc/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         rsync \
+        shadow \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
diff --git a/13.0-rc/fpm-alpine/entrypoint.sh b/13.0-rc/fpm-alpine/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0-rc/fpm-alpine/entrypoint.sh
+++ b/13.0-rc/fpm-alpine/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0-rc/fpm/entrypoint.sh b/13.0-rc/fpm/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0-rc/fpm/entrypoint.sh
+++ b/13.0-rc/fpm/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index cefd3de4..d77ee9eb 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         rsync \
+        shadow \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/14.0-rc/apache/entrypoint.sh b/14.0-rc/apache/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/14.0-rc/apache/entrypoint.sh
+++ b/14.0-rc/apache/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/14.0-rc/fpm-alpine/Dockerfile b/14.0-rc/fpm-alpine/Dockerfile
index 80ac903c..9126c9df 100644
--- a/14.0-rc/fpm-alpine/Dockerfile
+++ b/14.0-rc/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         rsync \
+        shadow \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
diff --git a/14.0-rc/fpm-alpine/entrypoint.sh b/14.0-rc/fpm-alpine/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/14.0-rc/fpm-alpine/entrypoint.sh
+++ b/14.0-rc/fpm-alpine/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016
diff --git a/14.0-rc/fpm/entrypoint.sh b/14.0-rc/fpm/entrypoint.sh
index 5a580142..0396c4aa 100755
--- a/14.0-rc/fpm/entrypoint.sh
+++ b/14.0-rc/fpm/entrypoint.sh
@@ -19,6 +19,13 @@ run_as() {
     fi
 }
 
+if [ -n "${NEXTCLOUD_UID+x}" ]; then
+    usermod -u "$NEXTCLOUD_UID" www-data
+fi
+if [ -n "${NEXTCLOUD_GID+x}" ]; then
+    groupmod -g "$NEXTCLOUD_GID" www-data
+fi
+
 installed_version="0.0.0.0"
 if [ -f /var/www/html/version.php ]; then
     # shellcheck disable=SC2016