diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 181715b..542bbbf 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.5.0
+version: 0.5.1
 appVersion: "v0.6.4"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
index 1539843..8f013c4 100644
--- a/charts/quickwit/templates/indexer-statefulset.yaml
+++ b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -7,6 +7,9 @@ metadata:
 spec:
   replicas: {{ .Values.indexer.replicaCount }}
   serviceName: {{ include "quickwit.fullname" . }}-headless
+  {{- if .Values.searcher.podManagementPolicy }}
+  podManagementPolicy: {{ .Values.indexer.podManagementPolicy }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "quickwit.indexer.selectorLabels" . | nindent 6 }}
diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml
index 127a5ff..a702fb7 100644
--- a/charts/quickwit/templates/searcher-statefulset.yaml
+++ b/charts/quickwit/templates/searcher-statefulset.yaml
@@ -7,6 +7,9 @@ metadata:
 spec:
   replicas: {{ .Values.searcher.replicaCount }}
   serviceName: {{ include "quickwit.fullname" . }}-headless
+  {{- if .Values.searcher.podManagementPolicy }}
+  podManagementPolicy: {{ .Values.searcher.podManagementPolicy }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "quickwit.searcher.selectorLabels" . | nindent 6 }}
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index e1eb921..86080e1 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -58,6 +58,8 @@ searcher:
     # maxUnavailable: 1
     # minAvailable: 2
 
+  # podManagementPolicy: OrderedReady
+
   persistentVolume:
     enabled: false
     # storage: "1Gi"
@@ -109,6 +111,8 @@ indexer:
     # maxUnavailable: 1
     # minAvailable: 2
 
+  # podManagementPolicy: OrderedReady
+
   updateStrategy: {}
     # type: RollingUpdate