diff --git a/stable/fluentd/Chart.yaml b/stable/fluentd/Chart.yaml
index 3baf0847d9..34d89ac03c 100644
--- a/stable/fluentd/Chart.yaml
+++ b/stable/fluentd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Fluentd Elasticsearch Helm chart for Kubernetes.
 icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png
 name: fluentd
-version: 2.0.1
+version: 2.0.2
 appVersion: v2.4.0
 home: https://www.fluentd.org/
 sources:
diff --git a/stable/fluentd/README.md b/stable/fluentd/README.md
index f996d0847b..a1b681e317 100644
--- a/stable/fluentd/README.md
+++ b/stable/fluentd/README.md
@@ -77,6 +77,7 @@ Parameter | Description | Default
 `autoscaling.minReplicas` | Set minimum number of replicas | `2`
 `autoscaling.maxReplicas` | Set maximum number of replicas | `5`
 `autoscaling.metrics` | metrics used for autoscaling | See [values.yaml](values.yaml)
+`terminationGracePeriodSeconds` | Optional duration in seconds the pod needs to terminate gracefully | `30`
 `metrics.enabled`                         | Set this to `true` to enable Prometheus metrics HTTP endpoint                         | `false`
 `metrics.service.port`                    | Prometheus metrics HTTP endpoint port                                                 | `24231`
 `metrics.serviceMonitor.enabled`          | Set this to `true` to create ServiceMonitor for Prometheus operator                   | `false`
diff --git a/stable/fluentd/templates/deployment.yaml b/stable/fluentd/templates/deployment.yaml
index c9500a07c9..0a7c00f09a 100644
--- a/stable/fluentd/templates/deployment.yaml
+++ b/stable/fluentd/templates/deployment.yaml
@@ -38,6 +38,7 @@ spec:
         - name: {{ $pullSecret }}
       {{- end }}
 {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/fluentd/values.yaml b/stable/fluentd/values.yaml
index bdf2f91841..2303661688 100644
--- a/stable/fluentd/values.yaml
+++ b/stable/fluentd/values.yaml
@@ -186,3 +186,7 @@ autoscaling:
         target:
           type: Utilization
           averageUtilization: 60
+
+# Consider to set higher value when using in conjuction with autoscaling
+# Full description about this field: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.15/#pod-v1-core
+terminationGracePeriodSeconds: 30