diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 5fcccea..729f8b5 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.7.0
+version: 0.7.1
 appVersion: "v0.8.2"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
index 7925567..52b1e09 100644
--- a/charts/quickwit/templates/indexer-statefulset.yaml
+++ b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -96,6 +96,7 @@ spec:
             {{- end }}
           resources:
             {{- toYaml .Values.indexer.resources | nindent 12 }}
+      terminationGracePeriodSeconds: {{ .Values.indexer.terminationGracePeriodSeconds }}
       volumes:
         - name: config
           configMap:
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index 3da863f..d27b912 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -196,6 +196,10 @@ indexer:
 
   affinity: {}
 
+  # Long grace period is recommended to wait for all index commit_timeout_secs and splits to be published
+  # See https://quickwit.io/docs/configuration/index-config#indexing-settings
+  terminationGracePeriodSeconds: 120
+
   persistentVolume:
     enabled: false
     # storage: "1Gi"