diff --git a/starter/templates/deployment.yaml b/starter/templates/deployment.yaml
index f3865ca..0aee08b 100644
--- a/starter/templates/deployment.yaml
+++ b/starter/templates/deployment.yaml
@@ -37,15 +37,24 @@ spec:
         image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
+          {{- if .Values.existingConfigmap }}
+        - configMapRef:
+            name: {{ .Values.existingConfigmap }}
+          {{- else }}
         - configMapRef:
             name: {{ include "common.fullname" . }}
-          {{- if .Values.extraEnvVarsSecret }}
+          {{- end }}
+          {{- if .Values.existingSecret }}
         - secretRef:
-            name: {{ .Values.extraEnvVarsSecret }}
+            name: {{ .Values.existingSecret }}
           {{- else }}
         - secretRef:
             name: {{ include "common.fullname" . }}
           {{- end }}
+          {{- if .Values.extraEnvVarsSecret }}
+        - secretRef:
+            name: {{ .Values.extraEnvVarsSecret }}
+          {{- end }}
         ports:
         - name: http
           containerPort: 5678