diff --git a/charts/stable/nextcloud/CHANGELOG.md b/charts/stable/nextcloud/CHANGELOG.md
index 6299b68f066..67ba4b3bd5c 100644
--- a/charts/stable/nextcloud/CHANGELOG.md
+++ b/charts/stable/nextcloud/CHANGELOG.md
@@ -1,6 +1,29 @@
 # Changelog<br>
 
 
+<a name="nextcloud-4.0.4"></a>
+### [nextcloud-4.0.4](https://github.com/truecharts/apps/compare/nextcloud-4.0.3...nextcloud-4.0.4) (2021-09-11)
+
+#### Chore
+
+* update nextcloud to latest postgresql and common
+* Use bitnami instead of stock postgresql container ([#960](https://github.com/truecharts/apps/issues/960))
+* update non-major ([#962](https://github.com/truecharts/apps/issues/962))
+
+#### Feat
+
+* pin all container references to digests ([#963](https://github.com/truecharts/apps/issues/963))
+
+#### Fix
+
+* make sure podSecurityContext is included in both SCALE and Helm installs ([#956](https://github.com/truecharts/apps/issues/956))
+
+#### Refactor
+
+* change image layout to enable renovate updates of sidecarts ([#955](https://github.com/truecharts/apps/issues/955))
+
+
+
 <a name="nextcloud-4.0.3"></a>
 ### [nextcloud-4.0.3](https://github.com/truecharts/apps/compare/nextcloud-4.0.2...nextcloud-4.0.3) (2021-09-10)
 
diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index aa657596ce2..601346a7d5a 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 22.1.1
+appVersion: 22.1.1@sha
 dependencies:
 - name: common
   repository: https://truecharts.org/
diff --git a/charts/stable/nextcloud/README.md b/charts/stable/nextcloud/README.md
index c245b0286c1..84093256f70 100644
--- a/charts/stable/nextcloud/README.md
+++ b/charts/stable/nextcloud/README.md
@@ -19,8 +19,8 @@ Kubernetes: `>=1.16.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | redis | 15.3.1 |
-| https://truecharts.org/ | common | 7.0.1 |
-| https://truecharts.org/ | postgresql | 2.0.0 |
+| https://truecharts.org/ | common | 7.0.3 |
+| https://truecharts.org/ | postgresql | 2.1.0 |
 
 ## Installing the Chart
 
diff --git a/charts/stable/nextcloud/SCALE/CHANGELOG.md b/charts/stable/nextcloud/SCALE/CHANGELOG.md
index b10b7cbba3c..9be151471b8 100644
--- a/charts/stable/nextcloud/SCALE/CHANGELOG.md
+++ b/charts/stable/nextcloud/SCALE/CHANGELOG.md
@@ -1,7 +1,21 @@
 
-<a name="nextcloud-4.0.3"></a>
-### [nextcloud-4.0.3](https://github.com/truecharts/apps/compare/nextcloud-4.0.2...nextcloud-4.0.3) (2021-09-10)
+<a name="nextcloud-4.0.4"></a>
+### [nextcloud-4.0.4](https://github.com/truecharts/apps/compare/nextcloud-4.0.3...nextcloud-4.0.4) (2021-09-11)
+
+#### Chore
+
+* update nextcloud to latest postgresql and common
+* Use bitnami instead of stock postgresql container ([#960](https://github.com/truecharts/apps/issues/960))
+* update non-major ([#962](https://github.com/truecharts/apps/issues/962))
+
+#### Feat
+
+* pin all container references to digests ([#963](https://github.com/truecharts/apps/issues/963))
 
 #### Fix
 
-* repair wrong initcontainer format on nextcloud
+* make sure podSecurityContext is included in both SCALE and Helm installs ([#956](https://github.com/truecharts/apps/issues/956))
+
+#### Refactor
+
+* change image layout to enable renovate updates of sidecarts ([#955](https://github.com/truecharts/apps/issues/955))
diff --git a/charts/stable/nextcloud/helm-values.md b/charts/stable/nextcloud/helm-values.md
index b587560812c..2177657782e 100644
--- a/charts/stable/nextcloud/helm-values.md
+++ b/charts/stable/nextcloud/helm-values.md
@@ -30,15 +30,15 @@ You will, however, be able to use all values referenced in the common chart here
 | envValueFrom.REDIS_HOST_PASSWORD.secretKeyRef.key | string | `"redis-password"` |  |
 | envValueFrom.REDIS_HOST_PASSWORD.secretKeyRef.name | string | `"rediscreds"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"nextcloud"` |  |
-| image.tag | string | `"22.1.1"` |  |
+| image.repository | string | `"docker.io/nextcloud"` |  |
+| image.tag | string | `"22.1.1@sha256:99d94124b2024c9f7f38dc12144a92bc0d68d110bcfd374169ebb7e8df0adf8e"` |  |
 | initContainers.init-postgresdb.command[0] | string | `"sh"` |  |
 | initContainers.init-postgresdb.command[1] | string | `"-c"` |  |
 | initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done"` |  |
 | initContainers.init-postgresdb.env[0].name | string | `"pghost"` |  |
 | initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` |  |
 | initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` |  |
-| initContainers.init-postgresdb.image | string | `"postgres:13.1"` |  |
+| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` |  |
 | initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` |  |
 | persistence.data.accessMode | string | `"ReadWriteOnce"` |  |
 | persistence.data.enabled | bool | `true` |  |
@@ -52,10 +52,17 @@ You will, however, be able to use all values referenced in the common chart here
 | persistence.redismaster.size | string | `"100Gi"` |  |
 | persistence.redismaster.type | string | `"pvc"` |  |
 | podSecurityContext.fsGroup | int | `33` |  |
+| podSecurityContext.fsGroupChangePolicy | string | `"OnRootMismatch"` |  |
+| podSecurityContext.runAsGroup | int | `0` |  |
+| podSecurityContext.runAsUser | int | `0` |  |
+| podSecurityContext.supplementalGroups | list | `[]` |  |
 | postgresql.enabled | bool | `true` |  |
 | postgresql.existingSecret | string | `"dbcreds"` |  |
 | postgresql.postgresqlDatabase | string | `"nextcloud"` |  |
 | postgresql.postgresqlUsername | string | `"nextcloud"` |  |
+| postgresqlImage.pullPolicy | string | `"IfNotPresent"` |  |
+| postgresqlImage.repository | string | `"bitnami/postgresql"` |  |
+| postgresqlImage.tag | string | `"13.4.0@sha256:7fff0f7e827cd8e1daa3adbf0ca3f19e21006023c0f6d1c2d835718961516a87"` |  |
 | probes | object | See below | Probe configuration -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
 | probes.liveness | object | See below | Liveness probe configuration |
 | probes.liveness.spec | object | "/" | If a HTTP probe is used (default for HTTP/HTTPS services) this path is used |
@@ -76,6 +83,5 @@ You will, however, be able to use all values referenced in the common chart here
 | service.hpb.ports.hpb.enabled | bool | `true` |  |
 | service.hpb.ports.hpb.port | int | `7867` |  |
 | service.main.ports.main.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
 
 All Rights Reserved - The TrueCharts Project
diff --git a/docs/apps/stable/nextcloud/CHANGELOG.md b/docs/apps/stable/nextcloud/CHANGELOG.md
index 6299b68f066..67ba4b3bd5c 100644
--- a/docs/apps/stable/nextcloud/CHANGELOG.md
+++ b/docs/apps/stable/nextcloud/CHANGELOG.md
@@ -1,6 +1,29 @@
 # Changelog<br>
 
 
+<a name="nextcloud-4.0.4"></a>
+### [nextcloud-4.0.4](https://github.com/truecharts/apps/compare/nextcloud-4.0.3...nextcloud-4.0.4) (2021-09-11)
+
+#### Chore
+
+* update nextcloud to latest postgresql and common
+* Use bitnami instead of stock postgresql container ([#960](https://github.com/truecharts/apps/issues/960))
+* update non-major ([#962](https://github.com/truecharts/apps/issues/962))
+
+#### Feat
+
+* pin all container references to digests ([#963](https://github.com/truecharts/apps/issues/963))
+
+#### Fix
+
+* make sure podSecurityContext is included in both SCALE and Helm installs ([#956](https://github.com/truecharts/apps/issues/956))
+
+#### Refactor
+
+* change image layout to enable renovate updates of sidecarts ([#955](https://github.com/truecharts/apps/issues/955))
+
+
+
 <a name="nextcloud-4.0.3"></a>
 ### [nextcloud-4.0.3](https://github.com/truecharts/apps/compare/nextcloud-4.0.2...nextcloud-4.0.3) (2021-09-10)
 
diff --git a/docs/apps/stable/nextcloud/helm-values.md b/docs/apps/stable/nextcloud/helm-values.md
index b587560812c..2177657782e 100644
--- a/docs/apps/stable/nextcloud/helm-values.md
+++ b/docs/apps/stable/nextcloud/helm-values.md
@@ -30,15 +30,15 @@ You will, however, be able to use all values referenced in the common chart here
 | envValueFrom.REDIS_HOST_PASSWORD.secretKeyRef.key | string | `"redis-password"` |  |
 | envValueFrom.REDIS_HOST_PASSWORD.secretKeyRef.name | string | `"rediscreds"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"nextcloud"` |  |
-| image.tag | string | `"22.1.1"` |  |
+| image.repository | string | `"docker.io/nextcloud"` |  |
+| image.tag | string | `"22.1.1@sha256:99d94124b2024c9f7f38dc12144a92bc0d68d110bcfd374169ebb7e8df0adf8e"` |  |
 | initContainers.init-postgresdb.command[0] | string | `"sh"` |  |
 | initContainers.init-postgresdb.command[1] | string | `"-c"` |  |
 | initContainers.init-postgresdb.command[2] | string | `"until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done"` |  |
 | initContainers.init-postgresdb.env[0].name | string | `"pghost"` |  |
 | initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.key | string | `"plainhost"` |  |
 | initContainers.init-postgresdb.env[0].valueFrom.secretKeyRef.name | string | `"dbcreds"` |  |
-| initContainers.init-postgresdb.image | string | `"postgres:13.1"` |  |
+| initContainers.init-postgresdb.image | string | `"{{ .Values.postgresqlImage.repository}}:{{ .Values.postgresqlImage.tag }}"` |  |
 | initContainers.init-postgresdb.imagePullPolicy | string | `"IfNotPresent"` |  |
 | persistence.data.accessMode | string | `"ReadWriteOnce"` |  |
 | persistence.data.enabled | bool | `true` |  |
@@ -52,10 +52,17 @@ You will, however, be able to use all values referenced in the common chart here
 | persistence.redismaster.size | string | `"100Gi"` |  |
 | persistence.redismaster.type | string | `"pvc"` |  |
 | podSecurityContext.fsGroup | int | `33` |  |
+| podSecurityContext.fsGroupChangePolicy | string | `"OnRootMismatch"` |  |
+| podSecurityContext.runAsGroup | int | `0` |  |
+| podSecurityContext.runAsUser | int | `0` |  |
+| podSecurityContext.supplementalGroups | list | `[]` |  |
 | postgresql.enabled | bool | `true` |  |
 | postgresql.existingSecret | string | `"dbcreds"` |  |
 | postgresql.postgresqlDatabase | string | `"nextcloud"` |  |
 | postgresql.postgresqlUsername | string | `"nextcloud"` |  |
+| postgresqlImage.pullPolicy | string | `"IfNotPresent"` |  |
+| postgresqlImage.repository | string | `"bitnami/postgresql"` |  |
+| postgresqlImage.tag | string | `"13.4.0@sha256:7fff0f7e827cd8e1daa3adbf0ca3f19e21006023c0f6d1c2d835718961516a87"` |  |
 | probes | object | See below | Probe configuration -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
 | probes.liveness | object | See below | Liveness probe configuration |
 | probes.liveness.spec | object | "/" | If a HTTP probe is used (default for HTTP/HTTPS services) this path is used |
@@ -76,6 +83,5 @@ You will, however, be able to use all values referenced in the common chart here
 | service.hpb.ports.hpb.enabled | bool | `true` |  |
 | service.hpb.ports.hpb.port | int | `7867` |  |
 | service.main.ports.main.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
 
 All Rights Reserved - The TrueCharts Project
diff --git a/docs/apps/stable/nextcloud/index.md b/docs/apps/stable/nextcloud/index.md
index c245b0286c1..84093256f70 100644
--- a/docs/apps/stable/nextcloud/index.md
+++ b/docs/apps/stable/nextcloud/index.md
@@ -19,8 +19,8 @@ Kubernetes: `>=1.16.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | redis | 15.3.1 |
-| https://truecharts.org/ | common | 7.0.1 |
-| https://truecharts.org/ | postgresql | 2.0.0 |
+| https://truecharts.org/ | common | 7.0.3 |
+| https://truecharts.org/ | postgresql | 2.1.0 |
 
 ## Installing the Chart
 
diff --git a/docs/index.yaml b/docs/index.yaml
index 2c1b60b5c39..d2288491a3a 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -87695,6 +87695,45 @@ entries:
     - https://github.com/truecharts/apps/releases/download/navidrome-3.1.5/navidrome-3.1.5.tgz
     version: 3.1.5
   nextcloud:
+  - apiVersion: v2
+    appVersion: 22.1.1@sha
+    created: "2021-09-11T19:24:58.876551683Z"
+    dependencies:
+    - name: common
+      repository: https://truecharts.org/
+      version: 7.0.3
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://truecharts.org/
+      version: 2.1.0
+    - condition: redis.enabled
+      name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 15.3.1
+    description: A private cloud server that puts the control and security of your
+      own data back into your hands.
+    digest: 67cd864b8bbb2f1823e2eb06dc26f379f2ebc7df52553ea65f70ea63950d8606
+    home: https://nextcloud.com/
+    icon: https://upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nextcloud_Logo.svg/1280px-Nextcloud_Logo.svg.png
+    keywords:
+    - nextcloud
+    - storage
+    - http
+    - web
+    - php
+    kubeVersion: '>=1.16.0-0'
+    maintainers:
+    - email: info@truecharts.org
+      name: TrueCharts
+      url: truecharts.org
+    name: nextcloud
+    sources:
+    - https://github.com/nextcloud/docker
+    - https://github.com/nextcloud/helm
+    type: application
+    urls:
+    - https://github.com/truecharts/apps/releases/download/nextcloud-4.0.4/nextcloud-4.0.4.tgz
+    version: 4.0.4
   - apiVersion: v2
     appVersion: 22.1.1
     created: "2021-09-10T14:00:38.960770164Z"
@@ -178718,4 +178757,4 @@ entries:
     urls:
     - https://github.com/truecharts/apps/releases/download/zwavejs2mqtt-3.1.5/zwavejs2mqtt-3.1.5.tgz
     version: 3.1.5
-generated: "2021-09-11T19:00:33.328622948Z"
+generated: "2021-09-11T19:24:58.941692367Z"