diff --git a/infra/charts/feast/charts/feast-core/templates/deployment.yaml b/infra/charts/feast/charts/feast-core/templates/deployment.yaml
index 8b2343ee9c..57f4d131c6 100644
--- a/infra/charts/feast/charts/feast-core/templates/deployment.yaml
+++ b/infra/charts/feast/charts/feast-core/templates/deployment.yaml
@@ -100,7 +100,12 @@ spec:
 
         {{- range $key, $value := .Values.envOverrides }}
         - name: {{ printf "%s" $key | replace "." "_" | upper | quote }}
+          {{- if eq (kindOf $value) "map" }}
+          valueFrom:
+            {{- toYaml $value | nindent 12}}
+          {{- else }}
           value: {{ $value | quote }}
+          {{- end}}
         {{- end }}
 
         command:
diff --git a/infra/charts/feast/charts/feast-jobcontroller/templates/deployment.yaml b/infra/charts/feast/charts/feast-jobcontroller/templates/deployment.yaml
index c9a33dbe28..c5ca61750c 100644
--- a/infra/charts/feast/charts/feast-jobcontroller/templates/deployment.yaml
+++ b/infra/charts/feast/charts/feast-jobcontroller/templates/deployment.yaml
@@ -100,7 +100,12 @@ spec:
 
         {{- range $key, $value := .Values.envOverrides }}
         - name: {{ printf "%s" $key | replace "." "_" | upper | quote }}
+          {{- if eq (kindOf $value) "map" }}
+          valueFrom:
+            {{- toYaml $value | nindent 12 }}
+          {{- else }}
           value: {{ $value | quote }}
+          {{- end }}
         {{- end }}
 
         command:
diff --git a/infra/charts/feast/charts/feast-serving/templates/deployment.yaml b/infra/charts/feast/charts/feast-serving/templates/deployment.yaml
index 610dbe5fee..556af48ffb 100644
--- a/infra/charts/feast/charts/feast-serving/templates/deployment.yaml
+++ b/infra/charts/feast/charts/feast-serving/templates/deployment.yaml
@@ -92,7 +92,12 @@ spec:
 
         {{- range $key, $value := .Values.envOverrides }}
         - name: {{ printf "%s" $key | replace "." "_" | upper | quote }}
+          {{- if eq (kindOf $value) "map" }}
+          valueFrom:
+            {{- toYaml $value | nindent 12 }}
+          {{- else }}
           value: {{ $value | quote }}
+          {{- end }}
         {{- end }}
 
         command: