diff --git a/examples/deployment/cert-manager.yml b/examples/deployment/cert-manager.yml
index 2705274..6f5b125 100644
--- a/examples/deployment/cert-manager.yml
+++ b/examples/deployment/cert-manager.yml
@@ -68,3 +68,11 @@ externalSecrets:
 tenant: test-tenant
 updateStrategy:
   type: Recreate
+
+extraEnvVarsMap:
+  TEST: value
+  TEST_SECRET:
+    valueFrom:
+      secretKeyRef:
+        name: my-custom-secret-name
+        key: test
\ No newline at end of file
diff --git a/ndustrial/cronjob/Chart.yaml b/ndustrial/cronjob/Chart.yaml
index 862dd00..1f2101d 100644
--- a/ndustrial/cronjob/Chart.yaml
+++ b/ndustrial/cronjob/Chart.yaml
@@ -14,5 +14,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.29
-appVersion: 0.1.29
+version: 0.1.30
+appVersion: 0.1.30
diff --git a/ndustrial/cronjob/templates/cronjob.yaml b/ndustrial/cronjob/templates/cronjob.yaml
index 9e00375..19e4796 100644
--- a/ndustrial/cronjob/templates/cronjob.yaml
+++ b/ndustrial/cronjob/templates/cronjob.yaml
@@ -125,9 +125,13 @@ spec:
                 {{- if .Values.extraEnvVarsMap }}
                 {{- range $key, $val := .Values.extraEnvVarsMap }}
                 - name: {{ $key }}
+                {{- if (kindIs "map" $val ) }}
+                {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 18 }}
+                {{- else }}
                   value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
                 {{- end }}
                 {{- end }}
+                {{- end }}
                 {{- if .Values.datadog }}
                 {{- include "nio-common.datadog.envs" (dict "value" .Values.datadog "context" $) | nindent 16 }}
                 {{- end }}
diff --git a/ndustrial/cronjob/values.yaml b/ndustrial/cronjob/values.yaml
index 0df38b0..ba2c51c 100644
--- a/ndustrial/cronjob/values.yaml
+++ b/ndustrial/cronjob/values.yaml
@@ -162,10 +162,15 @@ shareProcessNamespace: false
 ##
 extraEnvVars: []
 
-## @param extraEnvVarsMap Add extra environment variables to the Deployment container
+## @param extraEnvVarsMap Add extra environment variables to the Deployment container. Can be a single string or a valid environment mapping
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 
diff --git a/ndustrial/daemonset/Chart.yaml b/ndustrial/daemonset/Chart.yaml
index 75ebb57..c698be4 100644
--- a/ndustrial/daemonset/Chart.yaml
+++ b/ndustrial/daemonset/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.7
-appVersion: 0.1.7
+version: 0.1.8
+appVersion: 0.1.8
diff --git a/ndustrial/daemonset/templates/daemonset.yaml b/ndustrial/daemonset/templates/daemonset.yaml
index 6626d4c..18b468a 100644
--- a/ndustrial/daemonset/templates/daemonset.yaml
+++ b/ndustrial/daemonset/templates/daemonset.yaml
@@ -90,9 +90,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/ndustrial/daemonset/values.yaml b/ndustrial/daemonset/values.yaml
index 8989101..72d2d7b 100644
--- a/ndustrial/daemonset/values.yaml
+++ b/ndustrial/daemonset/values.yaml
@@ -340,6 +340,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 
diff --git a/ndustrial/deployment/Chart.yaml b/ndustrial/deployment/Chart.yaml
index 3d4cccc..851ca77 100644
--- a/ndustrial/deployment/Chart.yaml
+++ b/ndustrial/deployment/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.63
-appVersion: 0.1.63
+version: 0.1.64
+appVersion: 0.1.64
diff --git a/ndustrial/deployment/templates/deployment.yaml b/ndustrial/deployment/templates/deployment.yaml
index 45ead7a..db67210 100644
--- a/ndustrial/deployment/templates/deployment.yaml
+++ b/ndustrial/deployment/templates/deployment.yaml
@@ -104,9 +104,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/ndustrial/deployment/values.yaml b/ndustrial/deployment/values.yaml
index f557870..11a2a9e 100644
--- a/ndustrial/deployment/values.yaml
+++ b/ndustrial/deployment/values.yaml
@@ -389,6 +389,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 
diff --git a/ndustrial/nio-api/Chart.yaml b/ndustrial/nio-api/Chart.yaml
index 2c68bd5..e503262 100644
--- a/ndustrial/nio-api/Chart.yaml
+++ b/ndustrial/nio-api/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 1.0.11
-appVersion: 1.0.11
+version: 1.0.12
+appVersion: 1.0.12
diff --git a/ndustrial/nio-api/values.yaml b/ndustrial/nio-api/values.yaml
index 86eb6a4..d4e7cdf 100644
--- a/ndustrial/nio-api/values.yaml
+++ b/ndustrial/nio-api/values.yaml
@@ -365,6 +365,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 ## @param extraEnvVarsCM Name of existing ConfigMap containing extra env vars
diff --git a/ndustrial/statefulset/Chart.yaml b/ndustrial/statefulset/Chart.yaml
index 5ec467d..ca2c053 100644
--- a/ndustrial/statefulset/Chart.yaml
+++ b/ndustrial/statefulset/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
   - email: devops@ndustrial.io
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.39
-appVersion: 0.1.39
+version: 0.1.40
+appVersion: 0.1.40
diff --git a/ndustrial/statefulset/templates/statefuleset.yaml b/ndustrial/statefulset/templates/statefuleset.yaml
index 4b640a2..df286be 100644
--- a/ndustrial/statefulset/templates/statefuleset.yaml
+++ b/ndustrial/statefulset/templates/statefuleset.yaml
@@ -105,9 +105,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             {{- if .Values.datadog }}
             {{- include "nio-common.datadog.envs" (dict "value" .Values.datadog "context" $) | nindent 12 }}
             {{- end }}
diff --git a/ndustrial/statefulset/values.yaml b/ndustrial/statefulset/values.yaml
index db6545e..c3f5b00 100644
--- a/ndustrial/statefulset/values.yaml
+++ b/ndustrial/statefulset/values.yaml
@@ -363,6 +363,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}