diff --git a/stable/node-problem-detector/Chart.yaml b/stable/node-problem-detector/Chart.yaml
index 4eeabcbeea..6f2a0a3c17 100644
--- a/stable/node-problem-detector/Chart.yaml
+++ b/stable/node-problem-detector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: node-problem-detector
-version: "1.5.2"
+version: "1.6.0"
 appVersion: v0.7.0
 home: https://github.com/kubernetes/node-problem-detector
 description: Installs the node-problem-detector daemonset for monitoring extra attributes on nodes
diff --git a/stable/node-problem-detector/templates/servicemonitor.yaml b/stable/node-problem-detector/templates/servicemonitor.yaml
index ddc0a3b1b1..6487c75a40 100644
--- a/stable/node-problem-detector/templates/servicemonitor.yaml
+++ b/stable/node-problem-detector/templates/servicemonitor.yaml
@@ -23,4 +23,13 @@ spec:
   - port: exporter
     path: /metrics
     interval: 60s
+    relabelings:
+    - action: replace
+      targetLabel: node
+      sourceLabels:
+        - __meta_kubernetes_pod_node_name
+    - action: replace
+      targetLabel: host_ip
+      sourceLabels:
+        - __meta_kubernetes_pod_host_ip
 {{- end }}