diff --git a/helm/thingsboard/templates/mqtt-transport.yaml b/helm/thingsboard/templates/mqtt-transport.yaml
index a2fec0b5..a9dcf58d 100644
--- a/helm/thingsboard/templates/mqtt-transport.yaml
+++ b/helm/thingsboard/templates/mqtt-transport.yaml
@@ -103,6 +103,10 @@ spec:
           - name: MQTT_BIND_PORT
             value: "{{ .Values.mqtt.port.number }}"
           {{- end }}
+          {{- range .Values.mqtt.extraEnvVars }}
+          - name: {{ .key | upper  }}
+            value: {{ .value | quote }}
+          {{- end }}
           volumeMounts:
             - mountPath: /config
               name: {{ .Release.Name }}-mqtt-transport-config
diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml
index 3ce5c02a..ece2ddc1 100644
--- a/helm/thingsboard/templates/node.yaml
+++ b/helm/thingsboard/templates/node.yaml
@@ -111,7 +111,7 @@ spec:
           - name: JWT_REFRESH_TOKEN_EXPIRATION_TIME
             value: {{ .Values.node.authorization.refreshTokenExpirationTimeSeconds | default 604800 | quote }}
           {{- range .Values.node.extraEnvVars }}
-          - name: {{ .key }}
+          - name: {{ .key | upper }}
             value: {{ .value | quote }}
           {{- end }}
           - name: DEFAULT_INACTIVITY_TIMEOUT