diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index bbc4a691..5a3fc37e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,22 +1,10 @@
 contact_links:
-    - name: ❓ Ask a question
-      url: https://help.nextcloud.com/
-      about: Ask a question, get assistance or start a discussion regarding Nextcloud and/or this image
-    - name: Documentation - Nextcloud Server
-      url: https://docs.nextcloud.com/
-      about: Official documentation for Nextcloud Server
-    - name: Documentation - Nextcloud Docker Image
-      url: https://github.com/nextcloud/docker/blob/master/README.md
-      about: Official documentation for this image
-    - name: 🐳 Documentation - Docker
-      url: https://docs.docker.com/
-      about: Official documentation for Docker (installing, configuring, troubleshooting)  
-    - name: 🐳 Docker Forum
+    - name: 🐛 Nextcloud issue
+      url: https://github.com/nextcloud/server/issues/new/choose
+      about: Bug reports and feature requests for Nextcloud
+    - name: 🐳 Docker Support and Help
       url: https://forums.docker.com/
-      about: Ask a question, get assistance or start a discussion regarding Docker
-    - name: 🐛 Bug Report - Nextcloud Server
-      url: https://github.com/nextcloud/server/issues/new/choose
-      about: Report a bug in Nextcloud Server
-    - name: Enhancement Idea - Nextcloud Server
-      url: https://github.com/nextcloud/server/issues/new/choose
-      about: Suggest an enhancement idea for Nextcloud Server
+      about: Configuration, installation, networking and other questions
+    - name: ❓ Nextcloud Support and Help
+      url: https://help.nextcloud.com/
+      about: Configuration, webserver/proxy or performance issues and other questions
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 6705b196..3ca9ab54 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -166,7 +166,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -176,8 +176,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index d0058db8..47179e44 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -84,7 +84,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.12
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -154,8 +154,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index 2833cad0..3a984575 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -161,8 +161,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 6034a23d..472e005d 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -166,7 +166,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.6
 
 RUN set -ex; \
     fetchDeps=" \
@@ -176,8 +176,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 0a88a77e..b060e713 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -84,7 +84,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.6
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -154,8 +154,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 163df8c7..85d0f477 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.6
 
 RUN set -ex; \
     fetchDeps=" \
@@ -161,8 +161,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index bb799ffe..96b8511c 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -166,7 +166,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.0
 
 RUN set -ex; \
     fetchDeps=" \
@@ -176,8 +176,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index 7b9a37a1..ca69007f 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -84,7 +84,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.0
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -154,8 +154,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index 4579215f..68c7b75f 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     pecl install igbinary-3.2.16; \
     pecl install memcached-3.3.0 \
         --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.2.0 \
+    pecl install redis-6.1.0 \
         --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
     \
     docker-php-ext-enable \
@@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.0
 
 RUN set -ex; \
     fetchDeps=" \
@@ -161,8 +161,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/README.md b/README.md
index 1855c1da..ff65cf6a 100644
--- a/README.md
+++ b/README.md
@@ -147,23 +147,12 @@ If mounting additional volumes under `/var/www/html`, you should consider:
 
 **Data inside the main folder (`/var/www/html`) will be overridden/removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude).** The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` and if possible read-only so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s).
 
-## Running as an arbitrary user / file permissions / changing the default container user
-
-The default user within a container is root (uid = 0). By default, processes inside the container will expect to have root privileges. Network services will drop privileges and use `www-data` to serve requests. 
-
-Depending on your volumes configuration, this can lead to permission issues. You can address this by running the container with a different default user. When changing the default user, the image will no longer assume it has root privileges and will run all processes under the specified uid. To accomplish this, use the `--user` / `user` option in your container environment.
-
-See:
-
-- https://docs.docker.com/engine/containers/run/#user
-- https://github.com/docker-library/docs/tree/master/php#running-as-an-arbitrary-user
-- https://docs.podman.io/en/stable/markdown/podman-run.1.html#user-u-user-group
 
 ## Accessing the Nextcloud command-line interface (`occ`)
 
 To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
 ```console
-$ docker exec -it --user www-data CONTAINER_ID php occ
+$ docker exec --user www-data CONTAINER_ID php occ
 ```
 or for docker compose:
 ```console
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 978d07fc..2ea11765 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-stable_channel='30.0.8'
+stable_channel='30.0.6'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
diff --git a/latest.txt b/latest.txt
index 732676bd..221a8da0 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-31.0.2
+31.0.0
diff --git a/versions.json b/versions.json
index cf55b440..1d54bae2 100644
--- a/versions.json
+++ b/versions.json
@@ -1,9 +1,9 @@
 {
   "31": {
     "branch": "31",
-    "version": "31.0.2",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc",
+    "version": "31.0.0",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.0.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
@@ -27,9 +27,9 @@
   },
   "30": {
     "branch": "30",
-    "version": "30.0.8",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc",
+    "version": "30.0.6",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
@@ -53,9 +53,9 @@
   },
   "29": {
     "branch": "29",
-    "version": "29.0.14",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc",
+    "version": "29.0.12",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",