diff --git a/charts/stable/collabora/Chart.yaml b/charts/stable/collabora/Chart.yaml
index d1d3598aed8..b8c95b9cd7a 100644
--- a/charts/stable/collabora/Chart.yaml
+++ b/charts/stable/collabora/Chart.yaml
@@ -1,31 +1,31 @@
-kubeVersion: ">=1.24.0-0"
+kubeVersion: '>=1.24.0-0'
 apiVersion: v2
 name: collabora
-version: 2.0.20
-appVersion: 23.05.5.4.1
+version: 2.0.21
+appVersion: 23.05.6.3.1
 description: An awesome, Online Office suite image suitable for home use.
 home: https://truecharts.org/charts/stable/collabora
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/collabora.png
 deprecated: false
 sources:
-  - https://github.com/CollaboraOnline/online
-  - https://github.com/truecharts/charts/tree/master/charts/stable/collabora
-  - https://hub.docker.com/r/collabora/code
+- https://github.com/CollaboraOnline/online
+- https://github.com/truecharts/charts/tree/master/charts/stable/collabora
+- https://hub.docker.com/r/collabora/code
 maintainers:
-  - name: TrueCharts
-    email: info@truecharts.org
-    url: https://truecharts.org
+- name: TrueCharts
+  email: info@truecharts.org
+  url: https://truecharts.org
 keywords:
-  - office
-  - document
+- office
+- document
 dependencies:
-  - name: common
-    version: 14.5.0
-    repository: https://library-charts.truecharts.org
-    condition: ""
-    alias: ""
-    tags: []
-    import-values: []
+- name: common
+  version: 14.5.0
+  repository: https://library-charts.truecharts.org
+  condition: ""
+  alias: ""
+  tags: []
+  import-values: []
 annotations:
   max_scale_version: 23.10.1
   min_scale_version: 22.12.4
diff --git a/charts/stable/collabora/values.yaml b/charts/stable/collabora/values.yaml
index c03361adb12..97620de5644 100644
--- a/charts/stable/collabora/values.yaml
+++ b/charts/stable/collabora/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: collabora/code
   pullPolicy: IfNotPresent
-  tag: 23.05.5.4.1@sha256:a8cce07c949aa59cea0a7f1f220266a1a6d886c717c3b5005782baf6f384d645
+  tag: 23.05.6.3.1@sha256:6d21951e6376be4a12009b5058c57f3da7df06faf05c62406030b3652a3e78f6
 collabora:
   username: admin
   password: changeme
diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index a332cfe916e..65efb136143 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: '>=1.24.0-0'
 apiVersion: v2
 name: nextcloud
-version: 22.2.20
+version: 22.2.21
 appVersion: 27.1.4
 description: A private cloud server that puts the control and security of your own
   data back into your hands.
@@ -9,10 +9,10 @@ home: https://truecharts.org/charts/stable/nextcloud
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/nextcloud.png
 deprecated: false
 sources:
-- https://github.com/truecharts/containers/tree/master/mirrornextcloud-imaginary
+- https://github.com/truecharts/charts/tree/master/charts/stable/nextcloud
+- https://hub.docker.com/r/clamav/clamav
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
-- https://github.com/truecharts/charts/tree/master/charts/stable/nextcloud
 maintainers:
 - name: TrueCharts
   email: info@truecharts.org
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index ae72fec157a..dc3041437dc 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -21,7 +21,7 @@ clamavImage:
 collaboraImage:
   repository: collabora/code
   pullPolicy: IfNotPresent
-  tag: 23.05.5.4.1@sha256:a8cce07c949aa59cea0a7f1f220266a1a6d886c717c3b5005782baf6f384d645
+  tag: 23.05.6.3.1@sha256:6d21951e6376be4a12009b5058c57f3da7df06faf05c62406030b3652a3e78f6
 nextcloud:
   # Initial Credentials
   credentials: