diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index 0269f03aa12d6..a783a418a08a4 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -245,9 +245,8 @@ If release name contains chart name it will be used as a full name.
     - name: GIT_SYNC_ONE_TIME
       value: "true"
     {{- end }}
-    {{- range $i, $config := .Values.dags.gitSync.env }}
-    - name: {{ $config.name }}
-      value: {{ $config.value | quote }}
+    {{- with .Values.dags.gitSync.env }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   resources: {{ toYaml .Values.dags.gitSync.resources | nindent 6 }}
   volumeMounts:
diff --git a/chart/templates/statsd/statsd-deployment.yaml b/chart/templates/statsd/statsd-deployment.yaml
index 557bbc4f78899..7d28a653995f8 100644
--- a/chart/templates/statsd/statsd-deployment.yaml
+++ b/chart/templates/statsd/statsd-deployment.yaml
@@ -97,12 +97,8 @@ spec:
             - "--statsd.mapping-config=/etc/statsd-exporter/mappings.yml"
           {{- end }}
           resources: {{- toYaml .Values.statsd.resources | nindent 12 }}
-          {{- if .Values.statsd.env }}
-          env:
-            {{- range $i, $config := .Values.statsd.env }}
-            - value: {{ $config.value | quote }}
-              name: {{ $config.name | quote }}
-            {{- end }}
+          {{- with .Values.statsd.env }}
+          env: {{- toYaml . | nindent 12 }}
           {{- end }}
           ports:
             - name: statsd-ingest