diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml
index 046bc7f0..a8443edb 100644
--- a/artifacthub-repo.yml
+++ b/artifacthub-repo.yml
@@ -1,8 +1,8 @@
 ---
 repositoryID: 710272c4-d7d8-4c72-b104-ee010b22fb58
 owners:
-- name: Kubewarden developers
-  email: kubewarden@suse.de
+  - name: Kubewarden developers
+    email: cncf-kubewarden-maintainers@lists.cncf.io
 ignore: # (optional, packages that should not be indexed by Artifact Hub)
   - name: kubewarden-crds # Exact match
     # match semver, and ignore prereleases (with `-`), but not builds ( with `+`)
diff --git a/charts/kubewarden-controller/Chart.yaml b/charts/kubewarden-controller/Chart.yaml
index 0e6453d8..a9d8952d 100644
--- a/charts/kubewarden-controller/Chart.yaml
+++ b/charts/kubewarden-controller/Chart.yaml
@@ -18,7 +18,7 @@ keywords:
 home: https://www.kubewarden.io/
 maintainers:
   - name: Kubewarden Maintainers
-    email: kubewarden@suse.de
+    email: cncf-kubewarden-maintainers@lists.cncf.io
     url: https://github.com/orgs/kubewarden/teams/maintainers
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
diff --git a/charts/kubewarden-crds/Chart.yaml b/charts/kubewarden-crds/Chart.yaml
index dd378df1..1aa6e45f 100644
--- a/charts/kubewarden-crds/Chart.yaml
+++ b/charts/kubewarden-crds/Chart.yaml
@@ -7,7 +7,7 @@ kubeVersion: ">= 1.19.0-0"
 home: https://www.kubewarden.io/
 maintainers:
   - name: Kubewarden Maintainers
-    email: kubewarden@suse.de
+    email: cncf-kubewarden-maintainers@lists.cncf.io
     url: https://github.com/orgs/kubewarden/teams/maintainers
 keywords:
   - Kubewarden
diff --git a/charts/kubewarden-defaults/Chart.yaml b/charts/kubewarden-defaults/Chart.yaml
index 4cb6983c..f6480d65 100644
--- a/charts/kubewarden-defaults/Chart.yaml
+++ b/charts/kubewarden-defaults/Chart.yaml
@@ -7,7 +7,7 @@ kubeVersion: ">= 1.19.0-0"
 home: https://www.kubewarden.io/
 maintainers:
   - name: Kubewarden Maintainers
-    email: kubewarden@suse.de
+    email: cncf-kubewarden-maintainers@lists.cncf.io
     url: https://github.com/orgs/kubewarden/teams/maintainers
 keywords:
   - Kubewarden
diff --git a/updatecli/values.yaml b/updatecli/values.yaml
index fd50aca0..78435f71 100644
--- a/updatecli/values.yaml
+++ b/updatecli/values.yaml
@@ -6,5 +6,5 @@ github:
   token: "UPDATECLI_GITHUB_TOKEN"
   branch: "main"
   author: "Kubewarden bot"
-  email: "kubewarden@suse.de"
+  email: "cncf-kubewarden-maintainers@lists.cncf.io"
   user: "UPDATECLI_GITHUB_OWNER"