diff --git a/charts/zigbee2mqtt/templates/configmap.yaml b/charts/zigbee2mqtt/templates/configmap.yaml
index c999bd0..d449f71 100644
--- a/charts/zigbee2mqtt/templates/configmap.yaml
+++ b/charts/zigbee2mqtt/templates/configmap.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "zigbee2mqtt.labels" . | nindent 4 }}
 data:
     {{- if .Values.config.injectMqttAddress }}
-    ZIGBEE2MQTT_CONFIG_MQTT_SERVER: {{ .Values.injectMqttAddress }}
+    ZIGBEE2MQTT_CONFIG_MQTT_SERVER: {{ .Values.config.injectMqttAddress }}
     {{- end }}
     {{- with .Values.config.timezone }}
     TZ: {{ . | quote }}
diff --git a/charts/zigbee2mqtt/templates/deployment.yaml b/charts/zigbee2mqtt/templates/deployment.yaml
index 781b6c0..cc3654a 100644
--- a/charts/zigbee2mqtt/templates/deployment.yaml
+++ b/charts/zigbee2mqtt/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "zigbee2mqtt.fullname" . }}-zigbee2mqtt
+  name: {{ include "zigbee2mqtt.fullname" . }}
   labels:
     {{- include "zigbee2mqtt.labels" . | nindent 4 }}
 spec: