diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 322b231..7ef7142 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.21
+version: 0.7.22
 appVersion: v0.8.2
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 07a89b1..0b1ce75 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -88,7 +88,7 @@ spec:
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
             {{- end }}
-            {{- with .Values.indexer.extraVolumeMounts }}
+            {{- with .Values.control_plane.extraVolumeMounts }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
           resources:
@@ -107,14 +107,14 @@ spec:
           configMap:
             name: {{ .name }}
         {{- end }}
-        {{- with .Values.indexer.extraVolumes }}
+        {{- with .Values.control_plane.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with .Values.control_plane.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with merge .Values.affinity .Values.control_plane.affinity }}
+      {{- with merge (deepCopy .Values.affinity) .Values.control_plane.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
index e5f3199..1995937 100644
--- a/charts/quickwit/templates/indexer-statefulset.yaml
+++ b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -127,7 +127,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with merge .Values.affinity .Values.indexer.affinity }}
+      {{- with merge (deepCopy .Values.affinity) .Values.indexer.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/quickwit/templates/janitor-deployment.yaml b/charts/quickwit/templates/janitor-deployment.yaml
index b2bff91..f4a654f 100644
--- a/charts/quickwit/templates/janitor-deployment.yaml
+++ b/charts/quickwit/templates/janitor-deployment.yaml
@@ -88,7 +88,7 @@ spec:
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
             {{- end }}
-            {{- with .Values.indexer.extraVolumeMounts }}
+            {{- with .Values.janitor.extraVolumeMounts }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
           resources:
@@ -107,14 +107,14 @@ spec:
           configMap:
             name: {{ .name }}
         {{- end }}
-        {{- with .Values.indexer.extraVolumes }}
+        {{- with .Values.janitor.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with .Values.janitor.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with  merge .Values.affinity .Values.janitor.affinity }}
+      {{- with merge (deepCopy .Values.affinity) .Values.janitor.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/quickwit/templates/metastore-deployment.yaml b/charts/quickwit/templates/metastore-deployment.yaml
index f6db665..32c195c 100644
--- a/charts/quickwit/templates/metastore-deployment.yaml
+++ b/charts/quickwit/templates/metastore-deployment.yaml
@@ -112,7 +112,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with  merge .Values.affinity .Values.metastore.affinity }}
+      {{- with merge (deepCopy .Values.affinity) .Values.metastore.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml
index 1bc4cdd..9eda4b2 100644
--- a/charts/quickwit/templates/searcher-statefulset.yaml
+++ b/charts/quickwit/templates/searcher-statefulset.yaml
@@ -129,7 +129,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with  merge .Values.affinity .Values.searcher.affinity }}
+      {{- with merge (deepCopy .Values.affinity) .Values.searcher.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}