diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
index f18c956c1..27e34c0aa 100644
--- a/charts/sonarqube-dce/CHANGELOG.md
+++ b/charts/sonarqube-dce/CHANGELOG.md
@@ -1,6 +1,9 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [3.0.0]
+* updated SonarQube to 9.5.0
+
 ## [2.0.4]
 * Fix issue with additional network policy
 
diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
index 5f0d48ff7..1288db384 100644
--- a/charts/sonarqube-dce/Chart.yaml
+++ b/charts/sonarqube-dce/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sonarqube-dce
 description: SonarQube offers Code Quality and Code Security analysis for up to 27 languages. Find Bugs, Vulnerabilities, Security Hotspots and Code Smells throughout your workflow.
-version: 2.0.4
-appVersion: 9.4.0
+version: 3.0.0
+appVersion: 9.5.0
 keywords:
   - coverage
   - security
@@ -24,23 +24,19 @@ annotations:
     - name: Chart Source
       url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube-dce
   artifacthub.io/changes: |
-    - kind: changed
-      description: "changed links to get a better overview of sources"
-    - kind: changed
-      description: "changed description of dependency postgresql chart"
-    - kind: changed
-      description: "secure admin password in k8s secret"
-    - kind: changed
-      description: "Specify service account name in change admin password hook"
-    - kind: fixed
-      description: "Fixed properties scope for app deployment and search sts"
+    - kind: added
+      description: "adding tolerations and affinity to change password hooks"
+    - kind: added
+      description: "Add documentation to setup web context via environment variable"
+    - kind: added
+      description: "Add automount service account token flag"
     - kind: fixed
-      description: "Specify location of .netrc file when downloading plugins that require auth"
+      description: "Fix issue with additional network policy"
     - kind: changed
-      description: "updated SonarQube to 9.4.0"
+      description: "updated SonarQube to 9.5.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube-app
-      image: sonarqube:9.4.0-datacenter-app
+      image: sonarqube:9.5.0-datacenter-app
     - name: sonarqube-search
-      image: sonarqube:9.4.0-datacenter-app
+      image: sonarqube:9.5.0-datacenter-app
diff --git a/charts/sonarqube-dce/OWNERS b/charts/sonarqube-dce/OWNERS
index dc80d0d78..590e57648 100644
--- a/charts/sonarqube-dce/OWNERS
+++ b/charts/sonarqube-dce/OWNERS
@@ -1,4 +1,6 @@
 approvers:
-- tobias-trabelsi-sonarsource
+- leo-geoffroy-sonarsource
+- pierre-guillot-sonarsource
 reviewers:
-- tobias-trabelsi-sonarsource
+- leo-geoffroy-sonarsource
+- pierre-guillot-sonarsource
diff --git a/charts/sonarqube-dce/values.yaml b/charts/sonarqube-dce/values.yaml
index 1689dcaa5..ac540be71 100644
--- a/charts/sonarqube-dce/values.yaml
+++ b/charts/sonarqube-dce/values.yaml
@@ -5,7 +5,7 @@
 searchNodes:
   image:
     repository: sonarqube
-    tag: 9.4.0-datacenter-search
+    tag: 9.5.0-datacenter-search
     pullPolicy: IfNotPresent
     # If using a private repository, the imagePullSecrets to use
     # pullSecrets:
@@ -113,7 +113,7 @@ searchNodes:
 ApplicationNodes:
   image:
     repository: sonarqube
-    tag: 9.4.0-datacenter-app
+    tag: 9.5.0-datacenter-app
     pullPolicy: IfNotPresent
     # If using a private repository, the imagePullSecrets to use
     # pullSecrets:
diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md
index bca6d85e7..713bd3418 100644
--- a/charts/sonarqube/CHANGELOG.md
+++ b/charts/sonarqube/CHANGELOG.md
@@ -1,6 +1,9 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [4.0.0]
+* updated SonarQube to 9.5.0
+
 ## [3.0.4]
 * Fix issue with additional network policy
 
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index b8d2020a3..5604a0744 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: sonarqube
 description: SonarQube offers Code Quality and Code Security analysis for up to 27 languages. Find Bugs, Vulnerabilities, Security Hotspots and Code Smells throughout your workflow.
-version: 3.0.4
-appVersion: 9.4.0
+version: 4.0.0
+appVersion: 9.5.0
 keywords:
   - coverage
   - security
@@ -24,23 +24,17 @@ annotations:
     - name: Chart Source
       url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube
   artifacthub.io/changes: |
-    - kind: changed
-      description: "changed links to get a better overview of sources"
-    - kind: fixed
-      description: "Updated all instances of the caCerts enabled check"
-    - kind: changed
-      description: "changed description of dependency postgresql chart"
-    - kind: changed
-      description: "no longer automount service account token"
-    - kind: changed
-      description: "secure admin password in k8s secret"
-    - kind: changed
-      description: "Specify service account name in change admin password hook"
+    - kind: added
+      description: "adding tolerations and affinity to change password hooks"
+    - kind: added
+      description: "Add documentation to setup web context via environment variable"
+    - kind: added
+      description: "Add automount service account token flag"
     - kind: fixed
-      description: "Specify location of .netrc file when downloading plugins that require auth"
+      description: "Fix issue with additional network policy"
     - kind: changed
-      description: "updated SonarQube to 9.4.0"
+      description: "updated SonarQube to 9.5.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube
-      image: sonarqube:9.4.0-community
+      image: sonarqube:9.5.0-community
diff --git a/charts/sonarqube/OWNERS b/charts/sonarqube/OWNERS
index dc80d0d78..590e57648 100644
--- a/charts/sonarqube/OWNERS
+++ b/charts/sonarqube/OWNERS
@@ -1,4 +1,6 @@
 approvers:
-- tobias-trabelsi-sonarsource
+- leo-geoffroy-sonarsource
+- pierre-guillot-sonarsource
 reviewers:
-- tobias-trabelsi-sonarsource
+- leo-geoffroy-sonarsource
+- pierre-guillot-sonarsource
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
index 66ce9fa41..2bcf77031 100644
--- a/charts/sonarqube/values.yaml
+++ b/charts/sonarqube/values.yaml
@@ -27,7 +27,7 @@ edition: "community"
 
 image:
   repository: sonarqube
-  tag: 9.4.0-{{ .Values.edition }}
+  tag: 9.5.0-{{ .Values.edition }}
   pullPolicy: IfNotPresent
   # If using a private repository, the imagePullSecrets to use
   # pullSecrets: