diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml
index d7cc7cf..d3c6c86 100644
--- a/charts/common/templates/_envFromRef.yaml
+++ b/charts/common/templates/_envFromRef.yaml
@@ -1,24 +1,21 @@
 {{- define "common.envFromRef.tpl" -}}
-{{- if or (or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets) .Values.secretName -}}
+{{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets -}}
 envFrom: &envFrom
 {{- if .Values.vars }}
   - configMapRef:
       name: {{ template "common.robustName" .Release.Name }}
 {{- end }}
-{{- if .Values.envFrom }}
-
-{{- range .Values.envFrom.existingSecrets }}
+{{- range .Values.existingSecrets }}
   - secretRef:
       name: {{ .name }}
       optional: {{ .optional }}
 {{- end }}
 
-{{- range .Values.envFrom.existingConfigMaps }}
+{{- range .Values.existingConfigMaps }}
   - configMapRef:
       name: {{ .name }}
       optional: {{ .optional }}
 {{- end }}
-{{- end }}
 
 {{- if .Values.secretEnabled }}
   - secretRef:
diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz
index 854f9c0..11a7ba4 100644
Binary files a/charts/cron-job/charts/common-0.3.1.tgz and b/charts/cron-job/charts/common-0.3.1.tgz differ
diff --git a/charts/onechart/charts/common-0.3.1.tgz b/charts/onechart/charts/common-0.3.1.tgz
index 264c4c0..502b2c6 100644
Binary files a/charts/onechart/charts/common-0.3.1.tgz and b/charts/onechart/charts/common-0.3.1.tgz differ
diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index a733250..e9b1ae0 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -138,7 +138,7 @@ spec:
             - -c
             - {{ .Values.sidecar.command | quote }}
           {{- end }}
-          {{- if or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets }}
+          {{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets }}
           envFrom: *envFrom
           {{- end }}
           {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
diff --git a/charts/onechart/tests/deployment_configmap_test.yaml b/charts/onechart/tests/deployment_configmap_test.yaml
index 8c29ccc..dbb869b 100644
--- a/charts/onechart/tests/deployment_configmap_test.yaml
+++ b/charts/onechart/tests/deployment_configmap_test.yaml
@@ -14,14 +14,18 @@ tests:
           content:
             configMapRef:
               name: release-name
+  - it: Should not reference configmap if vars are not set
+    asserts:
+     - isNull:
+         path: spec.template.spec.containers[0].envFrom
+
   - it: Should reference to existing configmaps
     set:
-      envFrom:
-        existingConfigMaps:
-        - name: firstcm
-          optional: true
-        - name: secondcm
-          optional: true
+      existingConfigMaps:
+      - name: firstcm
+        optional: true
+      - name: secondcm
+        optional: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].envFrom
diff --git a/charts/onechart/tests/deployment_secret_test.yaml b/charts/onechart/tests/deployment_secret_test.yaml
index 4414e3a..64d3ef2 100644
--- a/charts/onechart/tests/deployment_secret_test.yaml
+++ b/charts/onechart/tests/deployment_secret_test.yaml
@@ -33,12 +33,11 @@ tests:
               name: release-name
   - it: Should reference to existing secrets
     set:
-      envFrom:
-        existingSecrets:
-        - name: firstsecret
-          optional: true
-        - name: secondsecret
-          optional: true
+      existingSecrets:
+      - name: firstsecret
+        optional: true
+      - name: secondsecret
+        optional: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].envFrom