diff --git a/bitnami/grafana/CHANGELOG.md b/bitnami/grafana/CHANGELOG.md
index 5117539bba..f419e98c0b 100644
--- a/bitnami/grafana/CHANGELOG.md
+++ b/bitnami/grafana/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 11.4.10 (2025-03-05)
+## 11.5.0 (2025-03-11)
 
-* [bitnami/grafana] Release 11.4.10 ([#32294](https://github.com/bitnami/charts/pull/32294))
+* [bitnami/grafana] Add `optional` option to the extraEnvVars ([#32401](https://github.com/bitnami/charts/pull/32401))
+
+## <small>11.4.10 (2025-03-05)</small>
+
+* [bitnami/grafana] Release 11.4.10 (#32294) ([61e42e2](https://github.com/bitnami/charts/commit/61e42e2c2f16f44403f60e5c7e41252c5e5290bf)), closes [#32294](https://github.com/bitnami/charts/issues/32294)
 
 ## <small>11.4.9 (2025-02-20)</small>
 
diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index c49805263d..1eda43f93c 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -31,4 +31,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana
-version: 11.4.10
+version: 11.5.0
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index cf07793f1c..8bfd453803 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -545,7 +545,9 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
 | `grafana.extraVolumes`                                      | Additional volumes for the Grafana pod                                                                                                                                                                                            | `[]`             |
 | `grafana.extraVolumeMounts`                                 | Additional volume mounts for the Grafana container                                                                                                                                                                                | `[]`             |
 | `grafana.extraEnvVarsCM`                                    | Name of existing ConfigMap containing extra env vars for Grafana nodes                                                                                                                                                            | `""`             |
+| `grafana.extraEnvVarsCMOptional`                            | Whether to still run the Grafana node if the ConfigMap does not exist                                                                                                                                                             | `false`          |
 | `grafana.extraEnvVarsSecret`                                | Name of existing Secret containing extra env vars for Grafana nodes                                                                                                                                                               | `""`             |
+| `grafana.extraEnvVarsSecretOptional`                        | Whether to still run the Grafana node if the Secret does not exist                                                                                                                                                                | `false`          |
 | `grafana.extraEnvVars`                                      | Array containing extra env vars to configure Grafana                                                                                                                                                                              | `[]`             |
 | `grafana.extraConfigmaps`                                   | Array to mount extra ConfigMaps to configure Grafana                                                                                                                                                                              | `[]`             |
 | `grafana.command`                                           | Override default container command (useful when using custom images)                                                                                                                                                              | `[]`             |
diff --git a/bitnami/grafana/templates/deployment.yaml b/bitnami/grafana/templates/deployment.yaml
index d754bda648..020361e591 100644
--- a/bitnami/grafana/templates/deployment.yaml
+++ b/bitnami/grafana/templates/deployment.yaml
@@ -129,10 +129,12 @@ spec:
             {{- if .Values.grafana.extraEnvVarsCM }}
             - configMapRef:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVarsCM "context" $) }}
+                optional: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVarsCMOptional "context" $) }}
             {{- end }}
             {{- if .Values.grafana.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVarsSecret "context" $) }}
+                optional: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVarsSecretOptional "context" $) }}
             {{- end }}
           env:
             - name: GF_SECURITY_ADMIN_PASSWORD
diff --git a/bitnami/grafana/values.yaml b/bitnami/grafana/values.yaml
index 02b40c5a58..f4a86194f2 100644
--- a/bitnami/grafana/values.yaml
+++ b/bitnami/grafana/values.yaml
@@ -560,9 +560,15 @@ grafana:
   ## @param grafana.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Grafana nodes
   ##
   extraEnvVarsCM: ""
+  ## @param grafana.extraEnvVarsCMOptional Whether to still run the Grafana node if the ConfigMap does not exist
+  ##
+  extraEnvVarsCMOptional: false
   ## @param grafana.extraEnvVarsSecret Name of existing Secret containing extra env vars for Grafana nodes
   ##
   extraEnvVarsSecret: ""
+  ## @param grafana.extraEnvVarsSecretOptional Whether to still run the Grafana node if the Secret does not exist
+  ##
+  extraEnvVarsSecretOptional: false
   ## @param grafana.extraEnvVars Array containing extra env vars to configure Grafana
   ## For example:
   ## extraEnvVars: