diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 5a3fc37e..1407f07e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,22 @@
 contact_links:
-    - 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: Configuration, installation, networking and other questions
-    - name: ❓ Nextcloud Support and Help
+    - name: ❓ Ask a question
       url: https://help.nextcloud.com/
-      about: Configuration, webserver/proxy or performance issues and other questions
+      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
+      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
diff --git a/README.md b/README.md
index ac5b0e28..9f13f17c 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,17 @@ 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`)
 
diff --git a/update.sh b/update.sh
index 0f224b06..95fd0a36 100755
--- a/update.sh
+++ b/update.sh
@@ -28,8 +28,8 @@ declare -A base=(
 
 declare -A extras=(
 	[apache]='\nRUN a2enmod headers rewrite remoteip ; \\\n    { \\\n     echo '\''RemoteIPHeader X-Real-IP'\''; \\\n     echo '\''RemoteIPInternalProxy 10.0.0.0/8'\''; \\\n     echo '\''RemoteIPInternalProxy 172.16.0.0/12'\''; \\\n     echo '\''RemoteIPInternalProxy 192.168.0.0/16'\''; \\\n    } > /etc/apache2/conf-available/remoteip.conf; \\\n    a2enconf remoteip\n\n# set apache config LimitRequestBody\nENV APACHE_BODY_LIMIT 1073741824\nRUN { \\\n     echo '\''LimitRequestBody ${APACHE_BODY_LIMIT}'\''; \\\n    } > /etc/apache2/conf-available/apache-limits.conf; \\\n    a2enconf apache-limits'
-	[fpm]=''
-	[fpm-alpine]=''
+	[fpm]='\nENV PHP_PM_MAX_CHILDREN 16\nRUN {\\\n     echo'\''pm = pm=dynamic'\''; \\\n     echo'\''pm.start_servers = 4'\''; \\\n     echo'\''pm.min_spare_servers = 2'\''; \\\n     echo'\''pm.max_spare_servers = 24'\''; \\\n     echo'\''pm.max_children = ${PHP_PM_MAX_CHILDREN}'\''; \\\n    } > "${PHP_FPM_DIR}/nextcloud.conf";\n'
+	[fpm-alpine]='\nENV PHP_PM_MAX_CHILDREN 16\nRUN {\\\n     echo'\''pm = pm=dynamic'\''; \\\n     echo'\''pm.start_servers = 4'\''; \\\n     echo'\''pm.min_spare_servers = 2'\''; \\\n     echo'\''pm.max_spare_servers = 24'\''; \\\n     echo'\''pm.max_children = ${PHP_PM_MAX_CHILDREN}'\''; \\\n    } > "${PHP_FPM_DIR}/nextcloud.conf";\n'
 )
 
 declare -A crontab_int=(