diff --git a/charts/kamaji/Chart.lock b/charts/kamaji/Chart.lock
index f22bdc0..1b0e1c9 100644
--- a/charts/kamaji/Chart.lock
+++ b/charts/kamaji/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: kamaji-etcd
   repository: https://clastix.github.io/charts
-  version: 0.11.0
-digest: sha256:96b4115b8c02f771f809ec1bed3be3a3903e7e8315d6966aa54b0f73230ea421
-generated: "2025-07-03T09:19:19.835421461+02:00"
+  version: 0.15.0
+digest: sha256:dffc71b76c5711884d1bb4b66dee859e4dc70b149b02b4d36d0c60d299d7c55a
+generated: "2026-05-25T10:39:07.251403781+02:00"
diff --git a/charts/kamaji/Chart.yaml b/charts/kamaji/Chart.yaml
index a7ec5fa..5a02266 100644
--- a/charts/kamaji/Chart.yaml
+++ b/charts/kamaji/Chart.yaml
@@ -21,7 +21,7 @@ version: 0.0.0+latest
 dependencies:
 - name: kamaji-etcd
   repository: https://clastix.github.io/charts
-  version: ">=0.11.0"
+  version: ">=0.15.0"
   condition: kamaji-etcd.deploy
 annotations:
   catalog.cattle.io/certified: partner
diff --git a/charts/kamaji/README.md b/charts/kamaji/README.md
index 69a9cef..ee16283 100644
--- a/charts/kamaji/README.md
+++ b/charts/kamaji/README.md
@@ -22,7 +22,7 @@ Kubernetes: `>=1.21.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://clastix.github.io/charts | kamaji-etcd | >=0.11.0 |
+| https://clastix.github.io/charts | kamaji-etcd | >=0.15.0 |
 
 [Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster.
 This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`.
@@ -82,7 +82,7 @@ Here the values you can override:
 | image.repository | string | `"clastix/kamaji"` | The container image of the Kamaji controller. |
 | image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
-| kamaji-etcd | object | `{"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd"}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
+| kamaji-etcd | object | `{"certManager":{"enabled":true,"issuerRef":{"group":"cert-manager.io","kind":"Issuer","name":"kamaji-selfsigned-issuer"}},"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd","selfSignedCertificates":{"enabled":false}}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
 | kubeconfigGenerator.affinity | object | `{}` | Kubernetes affinity rules to apply to Kubeconfig Generator controller pods |
 | kubeconfigGenerator.enableLeaderElect | bool | `true` | Enables the leader election. |
 | kubeconfigGenerator.enabled | bool | `false` | Toggle to deploy the Kubeconfig Generator Deployment. |
diff --git a/charts/kamaji/values.yaml b/charts/kamaji/values.yaml
index 0e99af1..98d4dc9 100644
--- a/charts/kamaji/values.yaml
+++ b/charts/kamaji/values.yaml
@@ -104,6 +104,14 @@ kamaji-etcd:
   fullnameOverride: kamaji-etcd
   ## -- Important, this must match your management cluster's clusterDomain, otherwise the init jobs will fail
   clusterDomain: "cluster.local"
+  selfSignedCertificates:
+    enabled: false
+  certManager:
+    enabled: true
+    issuerRef:
+      name: kamaji-selfsigned-issuer
+      kind: Issuer
+      group: cert-manager.io
   datastore:
     enabled: true
     name: default