diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 38ff065..c693cf7 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -124,3 +124,7 @@ spec:
       {{- if .Values.control_plane.runtimeClassName }}
       runtimeClassName: {{ .Values.control_plane.runtimeClassName | quote }}
       {{- end }}
+      {{- with .Values.control_plane.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{ end }}
diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
index d3adb76..b08dc92 100644
--- a/charts/quickwit/templates/indexer-statefulset.yaml
+++ b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -135,6 +135,10 @@ spec:
       {{- if .Values.indexer.runtimeClassName }}
       runtimeClassName: {{ .Values.indexer.runtimeClassName | quote }}
       {{- end }}
+      {{- with .Values.indexer.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{ end }}
   {{- if .Values.indexer.persistentVolume.enabled }}
   volumeClaimTemplates:
     - metadata:
diff --git a/charts/quickwit/templates/janitor-deployment.yaml b/charts/quickwit/templates/janitor-deployment.yaml
index 28e766f..7091f06 100644
--- a/charts/quickwit/templates/janitor-deployment.yaml
+++ b/charts/quickwit/templates/janitor-deployment.yaml
@@ -125,4 +125,8 @@ spec:
       {{- if .Values.janitor.runtimeClassName }}
       runtimeClassName: {{ .Values.janitor.runtimeClassName | quote }}
       {{- end }}
+      {{- with .Values.janitor.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{ end }}
 {{- end }}
diff --git a/charts/quickwit/templates/metastore-deployment.yaml b/charts/quickwit/templates/metastore-deployment.yaml
index b4eb4dc..dcdc04e 100644
--- a/charts/quickwit/templates/metastore-deployment.yaml
+++ b/charts/quickwit/templates/metastore-deployment.yaml
@@ -123,3 +123,7 @@ spec:
       {{- if .Values.metastore.runtimeClassName }}
       runtimeClassName: {{ .Values.metastore.runtimeClassName | quote }}
       {{- end }}
+      {{- with .Values.metastore.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{ end }}
diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml
index febe512..3159437 100644
--- a/charts/quickwit/templates/searcher-statefulset.yaml
+++ b/charts/quickwit/templates/searcher-statefulset.yaml
@@ -134,6 +134,10 @@ spec:
       {{- if .Values.searcher.runtimeClassName }}
       runtimeClassName: {{ .Values.searcher.runtimeClassName | quote }}
       {{- end }}
+      {{- with .Values.searcher.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{ end }}
   {{- if .Values.searcher.persistentVolume.enabled }}
   volumeClaimTemplates:
     - metadata:
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index 2b63435..c12c26c 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -143,6 +143,8 @@ searcher:
 
   runtimeClassName: ""
 
+  topologySpreadConstraints: {}
+
 indexer:
   replicaCount: 1
 
@@ -238,6 +240,8 @@ indexer:
     # storage: "1Gi"
     # storageClass: ""
 
+  topologySpreadConstraints: {}
+
 metastore:
   replicaCount: 1
 
@@ -307,6 +311,8 @@ metastore:
 
   runtimeClassName: ""
 
+  topologySpreadConstraints: {}
+
 control_plane:
   # Extra env for control plane
   extraEnv: {}
@@ -370,6 +376,8 @@ control_plane:
 
   runtimeClassName: ""
 
+  topologySpreadConstraints: {}
+
 janitor:
   # Enable Janitor service
   enabled: true
@@ -436,6 +444,8 @@ janitor:
 
   runtimeClassName: ""
 
+  topologySpreadConstraints: {}
+
 # Deploy jobs to bootstrap creation of indexes and sources for quickwit clusters
 bootstrap:
   # Enable bootstrap jobs