diff --git a/helm/thingsboard/templates/mqtt-transport.yaml b/helm/thingsboard/templates/mqtt-transport.yaml
index bec4a49..5f9aeeb 100644
--- a/helm/thingsboard/templates/mqtt-transport.yaml
+++ b/helm/thingsboard/templates/mqtt-transport.yaml
@@ -20,7 +20,7 @@ metadata:
   name: {{ .Release.Name }}-mqtt-transport
   labels:
     tags.datadoghq.com/service: tb-mqtt-transport
-    tags.datadoghq.com/version: {{ .AppVersion }}
+    tags.datadoghq.com/version: {{ .Values.image.tag }}
     {{- include "thingsboard.labels" . | nindent 4 }}
 spec:
 {{- $podLabels := include "thingsboard.selectorLabels-mqtt" . }}
@@ -43,7 +43,7 @@ spec:
     {{- end }}
       labels:
         tags.datadoghq.com/service: tb-mqtt-transport
-        tags.datadoghq.com/version: {{ .AppVersion }}
+        tags.datadoghq.com/version: {{ .Values.image.tag }}
         admission.datadoghq.com/enabled: "true"
         {{- include "thingsboard.selectorLabels-mqtt" . | nindent 8 }}
     spec:
diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml
index 4e949ac..ed662ec 100644
--- a/helm/thingsboard/templates/node.yaml
+++ b/helm/thingsboard/templates/node.yaml
@@ -20,7 +20,7 @@ metadata:
   name: {{ .Release.Name }}-node
   labels:
     tags.datadoghq.com/service: tb-node
-    tags.datadoghq.com/version: {{ .AppVersion }}
+    tags.datadoghq.com/version: {{ .Values.image.tag }}
     {{- include "thingsboard.labels" . | nindent 4 }}
 spec:
   {{- $podLabels := include "thingsboard.selectorLabels-node" . }}
@@ -43,7 +43,7 @@ spec:
     {{- end }}
       labels:
         tags.datadoghq.com/service: tb-node
-        tags.datadoghq.com/version: {{ .AppVersion }}
+        tags.datadoghq.com/version: {{ .Values.image.tag }}
         admission.datadoghq.com/enabled: "true"
         {{- include "thingsboard.selectorLabels-node" . | nindent 8 }}
     spec:
@@ -124,7 +124,7 @@ spec:
           - name: DEFAULT_INACTIVITY_TIMEOUT
             value: {{ .Values.node.state.defaultInactivityTimeoutInSec | default 600 | quote }}
           - name: DD_SERVICE_MAPPING
-            value: "postgres:thingsboard-postgres"
+            value: "postgresql:thingsboard-postgres"
           envFrom:
           - configMapRef:
               name: {{ .Release.Name }}-node-db-config
diff --git a/helm/thingsboard/templates/web-ui.yaml b/helm/thingsboard/templates/web-ui.yaml
index 020254d..86561fe 100644
--- a/helm/thingsboard/templates/web-ui.yaml
+++ b/helm/thingsboard/templates/web-ui.yaml
@@ -20,7 +20,7 @@ metadata:
   name: {{ .Release.Name }}-web-ui
   labels:
     tags.datadoghq.com/service: tb-ui
-    tags.datadoghq.com/version: {{ .AppVersion }}
+    tags.datadoghq.com/version: {{ .Values.image.tag }}
     {{- include "thingsboard.labels" . | nindent 4 }}
 spec:
 {{- if not .Values.webui.autoscaling.enabled }}
@@ -42,7 +42,7 @@ spec:
     {{- end }}
       labels:
         tags.datadoghq.com/service: tb-ui
-        tags.datadoghq.com/version: {{ .AppVersion }}
+        tags.datadoghq.com/version: {{ .Values.image.tag }}
         admission.datadoghq.com/enabled: "true"
         {{- include "thingsboard.selectorLabels-webui" . | nindent 8 }}
     spec: