diff --git a/packs/C++/charts/templates/deployment.yaml b/packs/C++/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/C++/charts/templates/deployment.yaml
+++ b/packs/C++/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/C++/charts/templates/ksvc.yaml b/packs/C++/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/C++/charts/templates/ksvc.yaml
+++ b/packs/C++/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/D/charts/templates/deployment.yaml b/packs/D/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/D/charts/templates/deployment.yaml
+++ b/packs/D/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/D/charts/templates/ksvc.yaml b/packs/D/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/D/charts/templates/ksvc.yaml
+++ b/packs/D/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/appserver/charts/templates/deployment.yaml b/packs/appserver/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/appserver/charts/templates/deployment.yaml
+++ b/packs/appserver/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/appserver/charts/templates/ksvc.yaml b/packs/appserver/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/appserver/charts/templates/ksvc.yaml
+++ b/packs/appserver/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/csharp/charts/templates/deployment.yaml b/packs/csharp/charts/templates/deployment.yaml
index fb25128a3..e7fc7f8b4 100644
--- a/packs/csharp/charts/templates/deployment.yaml
+++ b/packs/csharp/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/csharp/charts/templates/ksvc.yaml b/packs/csharp/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/csharp/charts/templates/ksvc.yaml
+++ b/packs/csharp/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/cwp/charts/templates/deployment.yaml b/packs/cwp/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/cwp/charts/templates/deployment.yaml
+++ b/packs/cwp/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/cwp/charts/templates/ksvc.yaml b/packs/cwp/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/cwp/charts/templates/ksvc.yaml
+++ b/packs/cwp/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/dropwizard/charts/templates/deployment.yaml b/packs/dropwizard/charts/templates/deployment.yaml
index 32b7d7e71..3842178ef 100644
--- a/packs/dropwizard/charts/templates/deployment.yaml
+++ b/packs/dropwizard/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/dropwizard/charts/templates/ksvc.yaml b/packs/dropwizard/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/dropwizard/charts/templates/ksvc.yaml
+++ b/packs/dropwizard/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/go-mongodb/charts/templates/deployment.yaml b/packs/go-mongodb/charts/templates/deployment.yaml
index 6b7cc2319..79dff6362 100644
--- a/packs/go-mongodb/charts/templates/deployment.yaml
+++ b/packs/go-mongodb/charts/templates/deployment.yaml
@@ -32,10 +32,7 @@ spec:
         env:
         - name: DB
           value: {{ template "fullname" . }}-db
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/go-mongodb/charts/templates/ksvc.yaml b/packs/go-mongodb/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/go-mongodb/charts/templates/ksvc.yaml
+++ b/packs/go-mongodb/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/go/charts/templates/deployment.yaml b/packs/go/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/go/charts/templates/deployment.yaml
+++ b/packs/go/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/go/charts/templates/ksvc.yaml b/packs/go/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/go/charts/templates/ksvc.yaml
+++ b/packs/go/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/gradle/charts/templates/deployment.yaml b/packs/gradle/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/gradle/charts/templates/deployment.yaml
+++ b/packs/gradle/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/gradle/charts/templates/ksvc.yaml b/packs/gradle/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/gradle/charts/templates/ksvc.yaml
+++ b/packs/gradle/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/javascript/charts/templates/deployment.yaml b/packs/javascript/charts/templates/deployment.yaml
index 769ccbc7d..13924b45e 100644
--- a/packs/javascript/charts/templates/deployment.yaml
+++ b/packs/javascript/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/javascript/charts/templates/ksvc.yaml b/packs/javascript/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/javascript/charts/templates/ksvc.yaml
+++ b/packs/javascript/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/liberty/charts/templates/deployment.yaml b/packs/liberty/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/liberty/charts/templates/deployment.yaml
+++ b/packs/liberty/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/liberty/charts/templates/ksvc.yaml b/packs/liberty/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/liberty/charts/templates/ksvc.yaml
+++ b/packs/liberty/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/maven-java11/charts/templates/deployment.yaml b/packs/maven-java11/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/maven-java11/charts/templates/deployment.yaml
+++ b/packs/maven-java11/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/maven-java11/charts/templates/ksvc.yaml b/packs/maven-java11/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/maven-java11/charts/templates/ksvc.yaml
+++ b/packs/maven-java11/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/maven/charts/templates/deployment.yaml b/packs/maven/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/maven/charts/templates/deployment.yaml
+++ b/packs/maven/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/maven/charts/templates/ksvc.yaml b/packs/maven/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/maven/charts/templates/ksvc.yaml
+++ b/packs/maven/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/ml-python-gpu-service/charts/templates/deployment.yaml b/packs/ml-python-gpu-service/charts/templates/deployment.yaml
index 304d44c4c..666f3b80e 100644
--- a/packs/ml-python-gpu-service/charts/templates/deployment.yaml
+++ b/packs/ml-python-gpu-service/charts/templates/deployment.yaml
@@ -27,10 +27,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/ml-python-gpu-service/charts/templates/ksvc.yaml b/packs/ml-python-gpu-service/charts/templates/ksvc.yaml
index 2dc2648d8..a51be926e 100644
--- a/packs/ml-python-gpu-service/charts/templates/ksvc.yaml
+++ b/packs/ml-python-gpu-service/charts/templates/ksvc.yaml
@@ -14,10 +14,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/ml-python-gpu-training/charts/templates/deployment.yaml b/packs/ml-python-gpu-training/charts/templates/deployment.yaml
index a549b51c1..ab910a2f9 100644
--- a/packs/ml-python-gpu-training/charts/templates/deployment.yaml
+++ b/packs/ml-python-gpu-training/charts/templates/deployment.yaml
@@ -29,10 +29,7 @@ spec:
         env:
         - name: TARGET_SERVICE_NAME
           value: {{ .Chart.Name | replace "-training" "-service"}}
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/ml-python-gpu-training/charts/templates/ksvc.yaml b/packs/ml-python-gpu-training/charts/templates/ksvc.yaml
index 2dc2648d8..a51be926e 100644
--- a/packs/ml-python-gpu-training/charts/templates/ksvc.yaml
+++ b/packs/ml-python-gpu-training/charts/templates/ksvc.yaml
@@ -14,10 +14,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/ml-python-service/charts/templates/deployment.yaml b/packs/ml-python-service/charts/templates/deployment.yaml
index 304d44c4c..666f3b80e 100644
--- a/packs/ml-python-service/charts/templates/deployment.yaml
+++ b/packs/ml-python-service/charts/templates/deployment.yaml
@@ -27,10 +27,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/ml-python-service/charts/templates/ksvc.yaml b/packs/ml-python-service/charts/templates/ksvc.yaml
index 2dc2648d8..a51be926e 100644
--- a/packs/ml-python-service/charts/templates/ksvc.yaml
+++ b/packs/ml-python-service/charts/templates/ksvc.yaml
@@ -14,10 +14,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/ml-python-training/charts/templates/deployment.yaml b/packs/ml-python-training/charts/templates/deployment.yaml
index a549b51c1..ab910a2f9 100644
--- a/packs/ml-python-training/charts/templates/deployment.yaml
+++ b/packs/ml-python-training/charts/templates/deployment.yaml
@@ -29,10 +29,7 @@ spec:
         env:
         - name: TARGET_SERVICE_NAME
           value: {{ .Chart.Name | replace "-training" "-service"}}
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/ml-python-training/charts/templates/ksvc.yaml b/packs/ml-python-training/charts/templates/ksvc.yaml
index 2dc2648d8..a51be926e 100644
--- a/packs/ml-python-training/charts/templates/ksvc.yaml
+++ b/packs/ml-python-training/charts/templates/ksvc.yaml
@@ -14,10 +14,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/php/charts/templates/deployment.yaml b/packs/php/charts/templates/deployment.yaml
index 769ccbc7d..13924b45e 100644
--- a/packs/php/charts/templates/deployment.yaml
+++ b/packs/php/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/php/charts/templates/ksvc.yaml b/packs/php/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/php/charts/templates/ksvc.yaml
+++ b/packs/php/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/python/charts/templates/deployment.yaml b/packs/python/charts/templates/deployment.yaml
index fb25128a3..e7fc7f8b4 100644
--- a/packs/python/charts/templates/deployment.yaml
+++ b/packs/python/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/python/charts/templates/ksvc.yaml b/packs/python/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/python/charts/templates/ksvc.yaml
+++ b/packs/python/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/ruby/charts/templates/deployment.yaml b/packs/ruby/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/ruby/charts/templates/deployment.yaml
+++ b/packs/ruby/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/ruby/charts/templates/ksvc.yaml b/packs/ruby/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/ruby/charts/templates/ksvc.yaml
+++ b/packs/ruby/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/rust/charts/templates/deployment.yaml b/packs/rust/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/rust/charts/templates/deployment.yaml
+++ b/packs/rust/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/rust/charts/templates/ksvc.yaml b/packs/rust/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/rust/charts/templates/ksvc.yaml
+++ b/packs/rust/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/scala/charts/templates/deployment.yaml b/packs/scala/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/scala/charts/templates/deployment.yaml
+++ b/packs/scala/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/scala/charts/templates/ksvc.yaml b/packs/scala/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/scala/charts/templates/ksvc.yaml
+++ b/packs/scala/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/swift/chart/templates/deployment.yaml b/packs/swift/chart/templates/deployment.yaml
index c06b09c06..12af5e37d 100644
--- a/packs/swift/chart/templates/deployment.yaml
+++ b/packs/swift/chart/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/swift/chart/templates/ksvc.yaml b/packs/swift/chart/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/swift/chart/templates/ksvc.yaml
+++ b/packs/swift/chart/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}
diff --git a/packs/typescript/charts/templates/deployment.yaml b/packs/typescript/charts/templates/deployment.yaml
index 1507ef6c2..6b2ad00f3 100644
--- a/packs/typescript/charts/templates/deployment.yaml
+++ b/packs/typescript/charts/templates/deployment.yaml
@@ -30,10 +30,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
-{{- range $pkey, $pval := .Values.env }}
-        - name: {{ $pkey }}
-          value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 10 }}
         envFrom:
 {{ toYaml .Values.envFrom | indent 10 }}
         ports:
diff --git a/packs/typescript/charts/templates/ksvc.yaml b/packs/typescript/charts/templates/ksvc.yaml
index d37fb3f82..d4858792b 100644
--- a/packs/typescript/charts/templates/ksvc.yaml
+++ b/packs/typescript/charts/templates/ksvc.yaml
@@ -18,10 +18,7 @@ spec:
             image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
-{{- range $pkey, $pval := .Values.env }}
-            - name: {{ $pkey }}
-              value: {{ quote $pval }}
-{{- end }}
+{{ toYaml .Values.env | indent 14 }}
             livenessProbe:
               httpGet:
                 path: {{ .Values.probePath }}