diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
index 9fd54d6cf..66cc22bab 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.
 
+## [4.0.0]
+* Updated SonarQube to 9.6.0
+
 ## [3.0.1]
 * Add documentation for ingress annotations
 
diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
index 5e565ae73..e1fdc51d0 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: 3.0.1
-appVersion: 9.5.0
+version: 4.0.0
+appVersion: 9.6.0
 keywords:
   - coverage
   - security
@@ -24,19 +24,11 @@ annotations:
     - name: Chart Source
       url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube-dce
   artifacthub.io/changes: |
-    - 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: "Fix issue with additional network policy"
     - kind: changed
-      description: "updated SonarQube to 9.5.0"
+      description: "Updated SonarQube to 9.6.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube-app
-      image: sonarqube:9.5.0-datacenter-app
+      image: sonarqube:9.6.0-datacenter-app
     - name: sonarqube-search
-      image: sonarqube:9.5.0-datacenter-app
+      image: sonarqube:9.6.0-datacenter-search
diff --git a/charts/sonarqube-dce/values.yaml b/charts/sonarqube-dce/values.yaml
index ac540be71..772286352 100644
--- a/charts/sonarqube-dce/values.yaml
+++ b/charts/sonarqube-dce/values.yaml
@@ -5,7 +5,7 @@
 searchNodes:
   image:
     repository: sonarqube
-    tag: 9.5.0-datacenter-search
+    tag: 9.6.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.5.0-datacenter-app
+    tag: 9.6.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 084594bc2..c4c478320 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.
 
+## [5.0.0]
+* Updated SonarQube to 9.6.0
+
 ## [4.0.3]
 * Add support for Openshift Route labels and annotations
 
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index a3b7d9334..78d63c2c3 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -1,9 +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: 4.0.3
-appVersion: 9.5.0
-
+version: 5.0.0
+appVersion: 9.6.0
 keywords:
   - coverage
   - security
@@ -25,17 +24,9 @@ annotations:
     - name: Chart Source
       url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube
   artifacthub.io/changes: |
-    - 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: "Fix issue with additional network policy"
     - kind: changed
-      description: "updated SonarQube to 9.5.0"
+      description: "Updated SonarQube to 9.6.0"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube
-      image: sonarqube:9.5.0-community
+      image: sonarqube:9.6.0-community
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
index 43d09fef4..52f57414c 100644
--- a/charts/sonarqube/values.yaml
+++ b/charts/sonarqube/values.yaml
@@ -27,7 +27,7 @@ edition: "community"
 
 image:
   repository: sonarqube
-  tag: 9.5.0-{{ .Values.edition }}
+  tag: 9.6.0-{{ .Values.edition }}
   pullPolicy: IfNotPresent
   # If using a private repository, the imagePullSecrets to use
   # pullSecrets: