diff --git a/charts/stable/collabora/Chart.yaml b/charts/stable/collabora/Chart.yaml
index 617a3ea25a4..9d0547cebf0 100644
--- a/charts/stable/collabora/Chart.yaml
+++ b/charts/stable/collabora/Chart.yaml
@@ -11,7 +11,7 @@ annotations:
   truecharts.org/min_kubernetes_version: 1.24.0
   truecharts.org/train: stable
 apiVersion: v2
-appVersion: 25.04.8.1.1
+appVersion: 25.04.8.2.1
 dependencies:
   - name: common
     version: 28.29.40
@@ -38,5 +38,5 @@ sources:
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/collabora
   - https://hub.docker.com/r/collabora/code
 type: application
-version: 9.13.17
+version: 9.13.18
 
diff --git a/charts/stable/collabora/values.yaml b/charts/stable/collabora/values.yaml
index d1c202c3d1a..6f7941d2a6d 100644
--- a/charts/stable/collabora/values.yaml
+++ b/charts/stable/collabora/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: docker.io/collabora/code
   pullPolicy: IfNotPresent
-  tag: 25.04.8.1.1@sha256:3c58d0e9bae75e4647467d0c7d91cb66f261d3e814709aed590b5c334a04db26
+  tag: 25.04.8.2.1@sha256:7983fd172c69f4545f93533fee62c06fdcd1aa0806f694db7b9ec6809caa4bd8
 collabora:
   username: admin
   password: changeme
diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index 567f8a23497..a1c525d1d00 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -51,5 +51,5 @@ sources:
   - https://hub.docker.com/r/clamav/clamav
   - https://hub.docker.com/r/collabora/code
 type: application
-version: 40.6.20
+version: 40.6.21
 
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index c27cd2661c0..0091b2320d1 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -21,7 +21,7 @@ clamavImage:
 collaboraImage:
   repository: docker.io/collabora/code
   pullPolicy: IfNotPresent
-  tag: 25.04.8.1.1@sha256:3c58d0e9bae75e4647467d0c7d91cb66f261d3e814709aed590b5c334a04db26
+  tag: 25.04.8.2.1@sha256:7983fd172c69f4545f93533fee62c06fdcd1aa0806f694db7b9ec6809caa4bd8
 
 nextcloud:
   # Initial Credentials