diff --git a/charts/modjo-microservice/templates/rollout-deployment.yaml b/charts/modjo-microservice/templates/rollout-deployment.yaml
index d080e5a..3d653e2 100644
--- a/charts/modjo-microservice/templates/rollout-deployment.yaml
+++ b/charts/modjo-microservice/templates/rollout-deployment.yaml
@@ -146,7 +146,15 @@ spec:
                   key: {{ .Values.application.minio.secretKeySecretKey }}
             {{- end }}
             {{- if .Values.extraEnv }}
-            {{ .Values.extraEnv | toYaml | nindent 12 }}
+            {{ (tpl (.Values.extraEnv | toYaml) $) | nindent 12 }}
+            {{- end }}
+            {{- range $name, $value := .Values.envMap }}
+            - name: "{{ $name }}"
+            {{- if kindIs "string" $value }}
+              value: {{ (tpl $value $) | quote }}
+            {{- else }}
+              {{- (tpl ($value | toYaml) $) | nindent 14 }}
+            {{- end }}
             {{- end }}
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
diff --git a/charts/modjo-microservice/values.yaml b/charts/modjo-microservice/values.yaml
index 205c37c..bfad932 100644
--- a/charts/modjo-microservice/values.yaml
+++ b/charts/modjo-microservice/values.yaml
@@ -4,8 +4,8 @@ nameOverride: ""
 exposed: true
 
 image:
-  repository: 
-  tag: 
+  repository:
+  tag:
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -38,9 +38,10 @@ application:
     jwkSecretKey: jwk.json
     jwkOldSecretKey: jwk-old.json
 
-extraEnv: 
-extraVolumes: 
-extraVolumeMounts: 
+envMap: {}
+extraEnv:
+extraVolumes:
+extraVolumeMounts:
 
 commonAnnotations: {}
 commonLabels: {}
@@ -81,8 +82,8 @@ autoscaling:
   enabled: false
   minReplicas: 1
   maxReplicas: 100
-  targetCPUUtilizationPercentage: 
-  targetMemoryUtilizationPercentage: 
+  targetCPUUtilizationPercentage:
+  targetMemoryUtilizationPercentage:
 
 replicaCount: 1
 
@@ -119,6 +120,6 @@ rollout:
 preview:
   ingress:
     enabled: false
-    hostname: 
+    hostname:
 
-automountServiceAccountToken: false
\ No newline at end of file
+automountServiceAccountToken: false