diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml
index e7a42365bb..ec3458748d 100644
--- a/bitnami/nginx/Chart.yaml
+++ b/bitnami/nginx/Chart.yaml
@@ -25,4 +25,4 @@ name: nginx
 sources:
   - https://github.com/bitnami/bitnami-docker-nginx
   - http://www.nginx.org
-version: 9.3.8
+version: 9.4.0
diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md
index 8924241b52..510e12cacf 100644
--- a/bitnami/nginx/README.md
+++ b/bitnami/nginx/README.md
@@ -133,6 +133,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `autoscaling.targetMemory`              | Target Memory utilization percentage                                                      | `nil`   |
 | `extraVolumes`                          | Array to add extra volumes                                                                | `[]`    |
 | `extraVolumeMounts`                     | Array to add extra mount                                                                  | `[]`    |
+| `serviceAccount.autoMount`              | Auto-mount the service account token in the pod                                           | `false` |
 | `serviceAccount.create`                 | Enable creation of ServiceAccount for nginx pod                                           | `false` |
 | `serviceAccount.name`                   | The name of the ServiceAccount to use.                                                    | `nil`   |
 | `serviceAccount.annotations`            | Annotations for service account. Evaluated as a template.                                 | `{}`    |
diff --git a/bitnami/nginx/templates/deployment.yaml b/bitnami/nginx/templates/deployment.yaml
index 61d428ac00..c27b1c1cf5 100644
--- a/bitnami/nginx/templates/deployment.yaml
+++ b/bitnami/nginx/templates/deployment.yaml
@@ -33,6 +33,7 @@ spec:
       {{- end }}
     spec:
       {{- include "nginx.imagePullSecrets" . | nindent 6 }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.autoMount }}
       serviceAccountName: {{ template "nginx.serviceAccountName" . }}
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml
index 2353f13eaa..fd77bd5c31 100644
--- a/bitnami/nginx/values.yaml
+++ b/bitnami/nginx/values.yaml
@@ -274,6 +274,9 @@ serviceAccount:
   ## Only used if `create` is `true`.
   ##
   annotations: {}
+  ## @param serviceAccount.autoMount Auto-mount the service account token in the pod
+  ##
+  autoMount: false
 ## @param sidecars Sidecar parameters
 ## e.g:
 ## sidecars: