diff --git a/charts/tasko-chart/templates/backend-deployment.yaml b/charts/tasko-chart/templates/backend-deployment.yaml
index f06589c..43ccbb1 100644
--- a/charts/tasko-chart/templates/backend-deployment.yaml
+++ b/charts/tasko-chart/templates/backend-deployment.yaml
@@ -43,12 +43,15 @@ spec:
           containerPort: {{ .Values.backend.service.targetPort }}
           protocol: TCP
         env:
-        {{- toYaml .Values.backend.env | nindent 8 }}
         - name: DATABASE_URL
           valueFrom:
             secretKeyRef:
               name: {{ include "tasko.fullname" . }}-secrets
               key: database-url
+        {{- range $key, $value := .Values.backend.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /
diff --git a/charts/tasko-chart/templates/frontend-deployment.yaml b/charts/tasko-chart/templates/frontend-deployment.yaml
index 528ebcc..96e00b9 100644
--- a/charts/tasko-chart/templates/frontend-deployment.yaml
+++ b/charts/tasko-chart/templates/frontend-deployment.yaml
@@ -38,8 +38,13 @@ spec:
         - name: http
           containerPort: {{ .Values.frontend.service.targetPort }}
           protocol: TCP
+        {{- if .Values.frontend.env }}
         env:
-        {{- toYaml .Values.frontend.env | nindent 8 }}
+        {{- range $key, $value := .Values.frontend.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /