diff --git a/tools/pytorchjob-generator/chart/templates/_helpers.tpl b/tools/pytorchjob-generator/chart/templates/_helpers.tpl
index f2ee7a9..1cc6463 100644
--- a/tools/pytorchjob-generator/chart/templates/_helpers.tpl
+++ b/tools/pytorchjob-generator/chart/templates/_helpers.tpl
@@ -76,10 +76,17 @@ resources:
 
 
 {{- define "mlbatch.env" }}
+{{- $envFromList := list }}
+{{- if .Values.envFrom }}
+  {{- $envFromList = .Values.envFrom }}
+{{- end }}
 {{- if .Values.ncclGdrEnvConfigMap }}
+  {{- $configMapRef := dict "configMapRef" (dict "name" .Values.ncclGdrEnvConfigMap) }}
+  {{- $envFromList = append $envFromList $configMapRef }}
+{{- end }}
+{{- if $envFromList }}
 envFrom:
-  - configMapRef:
-      name: {{ .Values.ncclGdrEnvConfigMap }}
+{{- toYaml $envFromList | nindent 2 }}
 {{- end }}
 {{- if or .Values.environmentVariables .Values.sshGitCloneConfig .Values.mountNVMe .Values.topologyFileConfigMap ( eq .Values.schedulerName "sakkara" ) }}
 env:
diff --git a/tools/pytorchjob-generator/chart/templates/appwrapper.yaml b/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
index aef07e9..7702e3e 100644
--- a/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
+++ b/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
@@ -116,10 +116,6 @@ spec:
                                       {{- include "mlbatch.volumes" . | indent 38 }}
                                       containers:
                                           - name: pytorch
-                                            {{- if .Values.envFrom }}
-                                            envFrom:
-                                            {{- toYaml .Values.envFrom | nindent 46 }}
-                                            {{- end }}
                                             image: {{ required "Please specify a 'containerImage' in the user file" .Values.containerImage }}
                                             imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
                                             {{- include "mlbatch.securityContext" . | indent 44 }}
@@ -143,10 +139,6 @@ spec:
                                       {{- include "mlbatch.volumes" . | indent 38 }}
                                       containers:
                                           - name: pytorch
-                                            {{- if .Values.envFrom }}
-                                            envFrom:
-                                            {{- toYaml .Values.envFrom | nindent 46 }}
-                                            {{- end }}
                                             image: {{ required "Please specify a 'containerImage' in the user file" .Values.containerImage }}
                                             imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
                                             {{- include "mlbatch.securityContext" . | indent 44 }}