diff --git a/deployment/helm/templates/deployment.yaml b/deployment/helm/templates/deployment.yaml
index b6d55ececc457a5a3c647fd148bda6d2c35e2cfd..05ff9217f111ebe333bdc78a30a3fd56f6b9fd86 100644
--- a/deployment/helm/templates/deployment.yaml
+++ b/deployment/helm/templates/deployment.yaml
@@ -50,14 +50,22 @@ spec:
             value: {{ .Values.infohub.http.timeout.read | quote }}
           - name: HTTP_WRITE_TIMEOUT
             value: {{ .Values.infohub.http.timeout.write | quote }}
+          {{- if .Values.mongo.addr }}
           - name: MONGO_ADDR
             value: {{ .Values.mongo.addr | quote }}
+          {{- end }}
+          {{- if .Values.mongo.user }}
           - name: MONGO_USER
             value: {{ .Values.mongo.user | quote }}
+          {{- end }}
+          {{- if .Values.mongo.pass }}
           - name: MONGO_PASS
             value: {{ .Values.mongo.pass | quote }}
+          {{- end }}
+          {{- if .Values.mongo.dbname }}
           - name: MONGO_DB
             value: {{ .Values.mongo.dbname | quote }}
+          {{- end }}
           - name: CACHE_ADDR
             value: {{ .Values.addresses.cache | quote }}
           - name: POLICY_ADDR
@@ -66,6 +74,15 @@ spec:
             value: {{ .Values.addresses.signer | quote }}
           - name: ISSUER_URI
             value: {{ .Values.addresses.issuerUri | 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 10 }}
           {{- end }}