diff --git a/charts/stable/etherpad/Chart.yaml b/charts/stable/etherpad/Chart.yaml
index 6904f7a42cc04..f6ca821ec5022 100644
--- a/charts/stable/etherpad/Chart.yaml
+++ b/charts/stable/etherpad/Chart.yaml
@@ -9,7 +9,7 @@ annotations:
   trueforge.org/min_helm_version: "3.14"
   trueforge.org/train: stable
 apiVersion: v2
-appVersion: 1.8.14
+appVersion: "2.6.1"
 dependencies:
   - name: common
     version: 29.1.0
@@ -35,9 +35,8 @@ maintainers:
 name: etherpad
 sources:
   - https://etherpad.org/
-  - https://ghcr.io/nicholaswilde/etherpad
+  - https://hub.docker.com/r/etherpad/etherpad
   - https://github.com/ether/etherpad-lite
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/etherpad
 type: application
-version: 20.1.0
-
+version: 21.0.0
diff --git a/charts/stable/etherpad/values.yaml b/charts/stable/etherpad/values.yaml
index 873f510cb8b7b..ee9a84026b5a7 100644
--- a/charts/stable/etherpad/values.yaml
+++ b/charts/stable/etherpad/values.yaml
@@ -1,8 +1,8 @@
 # yaml-language-server: $schema=./values.schema.json
 image:
-  repository: ghcr.io/nicholaswilde/etherpad
+  repository: docker.io/etherpad/etherpad
   pullPolicy: IfNotPresent
-  tag: version-1.8.14@sha256:26bbd45110d5b4d70246fafe40d4c4a7047b7b4fde409763a125324fa93b2d73
+  tag: 2.6.1@sha256:69a697fe6bf75aecf8748d734bcca5f0e596a6eeec8342ab030d0da8a6f224d5
 securityContext:
   container:
     readOnlyRootFilesystem: false
@@ -44,9 +44,6 @@ persistence:
   data:
     enabled: true
     mountPath: "/opt/etherpad-lite/var"
-  app:
-    enabled: true
-    mountPath: "/opt/etherpad-lite/app"
 cnpg:
   main:
     enabled: true