diff --git a/charts/port-k8s-exporter/Chart.yaml b/charts/port-k8s-exporter/Chart.yaml
index 6c48836..27e83fa 100644
--- a/charts/port-k8s-exporter/Chart.yaml
+++ b/charts/port-k8s-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: port-k8s-exporter
 description: A Helm chart for Port Kubernetes Exporter
 type: application
-version: 0.2.35
+version: 0.2.36
 appVersion: "0.4.2"
 home: https://getport.io/
 sources:
diff --git a/charts/port-k8s-exporter/templates/configmap.yaml b/charts/port-k8s-exporter/templates/configmap.yaml
index 1bfa958..9e634a6 100644
--- a/charts/port-k8s-exporter/templates/configmap.yaml
+++ b/charts/port-k8s-exporter/templates/configmap.yaml
@@ -1,5 +1,5 @@
 {{- if eq .Values.configMap.create true -}}
-{{- $stateKey := lower (default (uuidv4 | replace "-" "") .Values.stateKey) -}}
+{{- $stateKey := lower (default (uuidv4 | replace "-" "") (tpl .Values.stateKey $)) -}}
 {{- $config_lookup := (lookup "v1" "ConfigMap" .Release.Namespace (include "port-k8s-exporter.configMapName" .)) -}}
 {{- if (($config_lookup).data).state_key -}}
   {{- $stateKey = $config_lookup.data.state_key -}}
diff --git a/charts/port-k8s-exporter/templates/deployment.yaml b/charts/port-k8s-exporter/templates/deployment.yaml
index 28c83dd..aebb08f 100644
--- a/charts/port-k8s-exporter/templates/deployment.yaml
+++ b/charts/port-k8s-exporter/templates/deployment.yaml
@@ -72,8 +72,8 @@ spec:
             - name: EVENT_LISTENER_AUTHENTICATION_MECHANISM
               value: {{ .Values.eventListener.authenticationMechanism | quote }}
             {{- end }}
-          {{- with .Values.extraEnv }}
-            {{- toYaml . | nindent 12 }}
+          {{- if .Values.extraEnv }}
+            {{- tpl (toYaml .Values.extraEnv) $ | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: config-volume