diff --git a/bitnami/grafana/CHANGELOG.md b/bitnami/grafana/CHANGELOG.md
index 1d6835043d..d81824456f 100644
--- a/bitnami/grafana/CHANGELOG.md
+++ b/bitnami/grafana/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 11.3.8 (2024-07-05)
+## 11.3.9 (2024-07-16)
 
-* [bitnami/grafana] Release 11.3.8 ([#27804](https://github.com/bitnami/charts/pull/27804))
+* [bitnami/grafana] Global StorageClass as default value ([#28024](https://github.com/bitnami/charts/pull/28024))
+
+## <small>11.3.8 (2024-07-05)</small>
+
+* [bitnami/grafana] Release 11.3.8 (#27804) ([0623ed3](https://github.com/bitnami/charts/commit/0623ed35aae650b653e1c71a836f734ce8333c99)), closes [#27804](https://github.com/bitnami/charts/issues/27804)
 
 ## <small>11.3.7 (2024-07-03)</small>
 
diff --git a/bitnami/grafana/Chart.lock b/bitnami/grafana/Chart.lock
index 6e3241cc79..f2d786da70 100644
--- a/bitnami/grafana/Chart.lock
+++ b/bitnami/grafana/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.20.3
-digest: sha256:569e1c9d81abdcad3891e065c0f23c83786527d2043f2bc68193c43d18886c19
-generated: "2024-06-18T11:40:58.825478437Z"
+  version: 2.20.5
+digest: sha256:5b98791747a148b9d4956b81bb8635f49a0ae831869d700d52e514b8fd1a2445
+generated: "2024-07-16T12:07:05.132947+02:00"
diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index 4f6e2c75a9..5a86c5ba95 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -12,23 +12,23 @@ annotations:
 apiVersion: v2
 appVersion: 11.1.0
 dependencies:
-- name: common
-  repository: oci://registry-1.docker.io/bitnamicharts
-  tags:
-  - bitnami-common
-  version: 2.x.x
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    tags:
+      - bitnami-common
+    version: 2.x.x
 description: Grafana is an open source metric analytics and visualization suite for visualizing time series data that supports various types of data sources.
 home: https://bitnami.com
 icon: https://bitnami.com/assets/stacks/grafana/img/grafana-stack-220x234.png
 keywords:
-- analytics
-- monitoring
-- metrics
-- logs
+  - analytics
+  - monitoring
+  - metrics
+  - logs
 maintainers:
-- name: Broadcom, Inc. All Rights Reserved.
-  url: https://github.com/bitnami/charts
+  - name: Broadcom, Inc. All Rights Reserved.
+    url: https://github.com/bitnami/charts
 name: grafana
 sources:
-- https://github.com/bitnami/charts/tree/main/bitnami/grafana
-version: 11.3.8
+  - https://github.com/bitnami/charts/tree/main/bitnami/grafana
+version: 11.3.9
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index aa075a0d57..d2225fafbb 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -368,7 +368,8 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
 | ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
 | `global.imageRegistry`                                | Global Docker image registry                                                                                                                                                                                                                                                                                                                                        | `""`   |
 | `global.imagePullSecrets`                             | Global Docker registry secret names as an array                                                                                                                                                                                                                                                                                                                     | `[]`   |
-| `global.storageClass`                                 | Global StorageClass for Persistent Volume(s)                                                                                                                                                                                                                                                                                                                        | `""`   |
+| `global.defaultStorageClass`                          | Global default StorageClass for Persistent Volume(s)                                                                                                                                                                                                                                                                                                                | `""`   |
+| `global.storageClass`                                 | DEPRECATED: use global.defaultStorageClass instead                                                                                                                                                                                                                                                                                                                  | `""`   |
 | `global.compatibility.openshift.adaptSecurityContext` | Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) | `auto` |
 
 ### Common parameters
diff --git a/bitnami/grafana/values.yaml b/bitnami/grafana/values.yaml
index 982a2f738f..8e0aceb5f0 100644
--- a/bitnami/grafana/values.yaml
+++ b/bitnami/grafana/values.yaml
@@ -8,7 +8,8 @@
 
 ## @param global.imageRegistry Global Docker image registry
 ## @param global.imagePullSecrets Global Docker registry secret names as an array
-## @param global.storageClass Global StorageClass for Persistent Volume(s)
+## @param global.defaultStorageClass Global default StorageClass for Persistent Volume(s)
+## @param global.storageClass DEPRECATED: use global.defaultStorageClass instead
 ##
 global:
   imageRegistry: ""
@@ -17,6 +18,7 @@ global:
   ##   - myRegistryKeySecretName
   ##
   imagePullSecrets: []
+  defaultStorageClass: ""
   storageClass: ""
   ## Compatibility adaptations for Kubernetes platforms
   ##