diff --git a/deployment/helm/templates/deployment.yaml b/deployment/helm/templates/deployment.yaml
index de4b1a5516b96fcf7ec091e5a4f41ab3908c44d0..7546b783834b5bde15b0831b8b7e9efdc0f5790f 100644
--- a/deployment/helm/templates/deployment.yaml
+++ b/deployment/helm/templates/deployment.yaml
@@ -50,13 +50,21 @@ spec:
             value: {{ .Values.cache.http.timeout.read | quote }}
           - name: HTTP_WRITE_TIMEOUT
             value: {{ .Values.cache.http.timeout.write | quote }}
+          {{- if .Values.redis.addr }}
           - name: REDIS_ADDR
             value: {{ .Values.redis.addr | quote }}
+          {{- end }}
+          {{- if .Values.redis.user }}
           - name: REDIS_USER
             value: {{ .Values.redis.user | quote }}
+          {{- end }}
+          {{- if .Values.redis.pass }}
           - name: REDIS_PASS
             value: {{ .Values.redis.pass | quote }}
+          {{- end }}
+          {{- if .Values.redis.db }}
           - name: REDIS_DB
+          {{- end }}
             value: {{ .Values.redis.db | quote }}
           - name: REDIS_EXPIRATION
             value: {{ .Values.redis.expiration | quote }}
@@ -66,6 +74,15 @@ spec:
             value: {{ .Values.cache.nats.subject | quote }}
           - name: TEST_ENC_VAR
             value: {{ .Values.enc.var | quote }}
+          {{- if .Values.secretEnv }}
+          {{- range $key, $value := .Values.secretEnv }}
+          - name: "{{ $key }}"
+            valueFrom:
+              secretKeyRef:
+                name: "{{ $value.name }}"
+                key: "{{ $value.key }}"
+          {{- end }}
+          {{- end }}
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}
 {{- end }}