diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
index 4b6ed619d..aa031eb57 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.
 
+## [7.0.7]
+* Update SonarQube to 9.9.7
+
 ## [7.0.6]
 * Update SonarQube to 9.9.6
 
diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
index 5a0c10dc5..6d3a3a825 100644
--- a/charts/sonarqube-dce/Chart.yaml
+++ b/charts/sonarqube-dce/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 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.
 type: application
-version: 7.0.6
-appVersion: 9.9.6
+version: 7.0.7
+appVersion: 9.9.7
 keywords:
   - coverage
   - security
@@ -27,7 +27,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "Update SonarQube to 9.9.6"
+      description: "Update SonarQube to 9.9.7"
   artifacthub.io/links: |
     - name: support
       url: https://community.sonarsource.com/
@@ -36,9 +36,9 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube-app
-      image: sonarqube:9.9.6-datacenter-app
+      image: sonarqube:9.9.7-datacenter-app
     - name: sonarqube-search
-      image: sonarqube:9.9.6-datacenter-search
+      image: sonarqube:9.9.7-datacenter-search
 dependencies:
   - name: postgresql
     version: 10.15.0
diff --git a/charts/sonarqube-dce/README.md b/charts/sonarqube-dce/README.md
index c302ab431..1e6a2c270 100644
--- a/charts/sonarqube-dce/README.md
+++ b/charts/sonarqube-dce/README.md
@@ -14,7 +14,7 @@ Please note that this chart does NOT support SonarQube Community, Developer, and
 
 ## Compatibility
 
-Compatible SonarQube Version: `9.9.6`
+Compatible SonarQube Version: `9.9.7`
 
 Supported Kubernetes Versions: From `1.23` to `1.26`
 
@@ -133,7 +133,7 @@ The following table lists the configurable parameters of the SonarQube chart and
 | Parameter | Description | Default                   |
 | --------- | ----------- |---------------------------|
 | `searchNodes.image.repository` | search image repository | `sonarqube`               |
-| `searchNodes.image.tag` | search image tag | `9.9.6-datacenter-search` |
+| `searchNodes.image.tag` | search image tag | `9.9.7-datacenter-search` |
 | `searchNodes.image.pullPolicy` | search image pull policy | `IfNotPresent`            |
 | `searchNodes.image.pullSecret` | (DEPRECATED) search imagePullSecret to use for private repository | `nil`                     |
 | `searchNodes.image.pullSecrets` | search imagePullSecrets to use for private repository | `nil`                     |
@@ -176,7 +176,7 @@ The following table lists the configurable parameters of the SonarQube chart and
 | Parameter | Description | Default                |
 | --------- | ----------- |------------------------|
 | `ApplicationNodes.image.repository` | app image repository | `sonarqube`            |
-| `ApplicationNodes.image.tag` | app image tag | `9.9.6-datacenter-app` |
+| `ApplicationNodes.image.tag` | app image tag | `9.9.7-datacenter-app` |
 | `ApplicationNodes.image.pullPolicy` | app image pull policy | `IfNotPresent`         |
 | `ApplicationNodes.image.pullSecret` | (DEPRECATED) app imagePullSecret to use for private repository | `nil`                  |
 | `ApplicationNodes.image.pullSecrets` | app imagePullSecrets to use for private repository | `nil`                  |
diff --git a/charts/sonarqube-dce/values.yaml b/charts/sonarqube-dce/values.yaml
index 4907bda74..9f7636712 100644
--- a/charts/sonarqube-dce/values.yaml
+++ b/charts/sonarqube-dce/values.yaml
@@ -5,7 +5,7 @@
 searchNodes:
   image:
     repository: sonarqube
-    tag: 9.9.6-datacenter-search
+    tag: 9.9.7-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.9.6-datacenter-app
+    tag: 9.9.7-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 d06586ea9..9f452ca5b 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.
 
+## [8.0.7]
+* Update SonarQube to 9.9.7
+
 ## [8.0.6]
 * Update SonarQube to 9.9.6
 
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index 187976585..865e4c3da 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 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.
 type: application
-version: 8.0.6
-appVersion: 9.9.6
+version: 8.0.7
+appVersion: 9.9.7
 keywords:
   - coverage
   - security
@@ -32,11 +32,11 @@ annotations:
       url: https://github.com/SonarSource/helm-chart-sonarqube/tree/master/charts/sonarqube
   artifacthub.io/changes: |
     - kind: changed
-      description: "Update SonarQube to 9.9.6"
+      description: "Update SonarQube to 9.9.7"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube
-      image: sonarqube:9.9.6-community
+      image: sonarqube:9.9.7-community
 dependencies:
   - name: postgresql
     version: 10.15.0
diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md
index 6cee04e28..0a2bd7f64 100644
--- a/charts/sonarqube/README.md
+++ b/charts/sonarqube/README.md
@@ -14,7 +14,7 @@ Please note that this chart only supports SonarQube Community, Developer, and En
 
 ## Compatibility
 
-Compatible SonarQube Version: `9.9.6`
+Compatible SonarQube Version: `9.9.7`
 
 Supported Kubernetes Versions: From `1.23` to `1.26`
 
@@ -172,7 +172,7 @@ The following table lists the configurable parameters of the SonarQube chart and
 | Parameter | Description | Default                       |
 | --------- | ----------- |-------------------------------|
 | `image.repository` | image repository | `sonarqube`                   |
-| `image.tag` | `sonarqube` image tag. | `9.9.6-{{ .Values.edition }}` |
+| `image.tag` | `sonarqube` image tag. | `9.9.7-{{ .Values.edition }}` |
 | `image.pullPolicy` | Image pull policy  | `IfNotPresent`                |
 | `image.pullSecret` | (DEPRECATED) imagePullSecret to use for private repository | `None`                        |
 | `image.pullSecrets` | imagePullSecrets to use for private repository | `None`                        |
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
index 41f9d9c26..6c58e2e57 100644
--- a/charts/sonarqube/values.yaml
+++ b/charts/sonarqube/values.yaml
@@ -27,7 +27,7 @@ edition: "community"
 
 image:
   repository: sonarqube
-  tag: 9.9.6-{{ .Values.edition }}
+  tag: 9.9.7-{{ .Values.edition }}
   pullPolicy: IfNotPresent
   # If using a private repository, the imagePullSecrets to use
   # pullSecrets: