diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 38ff065..e3453c9 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -56,9 +56,8 @@ spec:
           {{- end }}
           env:
             {{- include "quickwit.environment" . | nindent 12 }}
-            {{- range $key, $value := .Values.control_plane.extraEnv }}
-            - name: "{{ $key }}"
-              value: "{{ $value }}"
+            {{- with .Values.control_plane.extraEnv }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- if or (.Values.environmentFrom) (.Values.control_plane.extraEnvFrom) }}
           envFrom:
diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
index d3adb76..aeba871 100644
--- a/charts/quickwit/templates/indexer-statefulset.yaml
+++ b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -60,9 +60,8 @@ spec:
           {{- end }}
           env:
             {{- include "quickwit.environment" . | nindent 12 }}
-            {{- range $key, $value := .Values.indexer.extraEnv }}
-            - name: "{{ $key }}"
-              value: "{{ $value }}"
+            {{- with .Values.indexer.extraEnv }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- if or (.Values.environmentFrom) (.Values.indexer.extraEnvFrom) }}
           envFrom:
diff --git a/charts/quickwit/templates/janitor-deployment.yaml b/charts/quickwit/templates/janitor-deployment.yaml
index 28e766f..f534363 100644
--- a/charts/quickwit/templates/janitor-deployment.yaml
+++ b/charts/quickwit/templates/janitor-deployment.yaml
@@ -57,9 +57,8 @@ spec:
           {{- end }}
           env:
             {{- include "quickwit.environment" . | nindent 12 }}
-            {{- range $key, $value := .Values.janitor.extraEnv }}
-            - name: "{{ $key }}"
-              value: "{{ $value }}"
+            {{- with .Values.janitor.extraEnv }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- if or (.Values.environmentFrom) (.Values.janitor.extraEnvFrom) }}
           envFrom:
diff --git a/charts/quickwit/templates/metastore-deployment.yaml b/charts/quickwit/templates/metastore-deployment.yaml
index b4eb4dc..f3661f7 100644
--- a/charts/quickwit/templates/metastore-deployment.yaml
+++ b/charts/quickwit/templates/metastore-deployment.yaml
@@ -55,9 +55,8 @@ spec:
           {{- end }}
           env:
             {{- include "quickwit.environment" . | nindent 12 }}
-            {{- range $key, $value := .Values.metastore.extraEnv }}
-            - name: "{{ $key }}"
-              value: "{{ $value }}"
+            {{- with .Values.metastore.extraEnv }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- if or (.Values.environmentFrom) (.Values.metastore.extraEnvFrom) }}
           envFrom:
diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml
index febe512..52c97d0 100644
--- a/charts/quickwit/templates/searcher-statefulset.yaml
+++ b/charts/quickwit/templates/searcher-statefulset.yaml
@@ -60,9 +60,8 @@ spec:
           {{- end }}
           env:
             {{- include "quickwit.environment" . | nindent 12 }}
-            {{- range $key, $value := .Values.searcher.extraEnv }}
-            - name: "{{ $key }}"
-              value: "{{ $value }}"
+            {{- with .Values.searcher.extraEnv }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- if or (.Values.environmentFrom) (.Values.searcher.extraEnvFrom) }}
           envFrom:
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index 2b63435..527dee5 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -40,8 +40,9 @@ securityContext:
   runAsUser: 1005
 
 # Additional global env
-environment: {}
-  # KEY: VALUE
+environment: []
+  # - name: KEY
+  #   value: VALUE
 environmentFrom: []
   # - secretRef:
   #     name: quickwit
@@ -56,8 +57,9 @@ searcher:
   replicaCount: 3
 
   # Extra env for searcher
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   extraEnvFrom: []
     # - secretRef:
     #     name: quickwit-searcher
@@ -147,8 +149,9 @@ indexer:
   replicaCount: 1
 
   # Extra env for indexer
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   extraEnvFrom: []
     # - secretRef:
     #     name: quickwit-indexer
@@ -242,8 +245,9 @@ metastore:
   replicaCount: 1
 
   # Extra env for metastore
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   # This is the recommended way to inject `QW_METASTORE_URI` when using the postgres metastore (see https://quickwit.io/docs/configuration/metastore-config)
   extraEnvFrom: []
     # - secretRef:
@@ -309,8 +313,9 @@ metastore:
 
 control_plane:
   # Extra env for control plane
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   extraEnvFrom: []
     # - secretRef:
     #     name: quickwit-control-plane
@@ -375,8 +380,9 @@ janitor:
   enabled: true
 
   # Extra env for janitor
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   extraEnvFrom: []
     # - secretRef:
     #     name: quickwit-janitor
@@ -442,8 +448,9 @@ bootstrap:
   enabled: false
 
   # Extra env for bootstrap jobs
-  extraEnv: {}
-    # KEY: VALUE
+  extraEnv: []
+    # - name: KEY
+    #   value: VALUE
   extraEnvFrom: []
     # - secretRef:
     #     name: quickwit-bootstrap