diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index ffa161297218bb52f6df67029672f3fbd6fd20a4..264f4a08b3155ad5313bb8520fb36abdfd43428d 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -68,7 +68,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       local toleration = daemonset.mixin.spec.template.spec.tolerationsType;
       local containerEnv = container.envType;
 
-      local podLabels = { app: 'node-exporter' };
+      local podLabels = $._config.nodeExporter.labels;
 
       local existsToleration = toleration.new() +
                                toleration.withOperator('Exists');
@@ -132,7 +132,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       daemonset.new() +
       daemonset.mixin.metadata.withName('node-exporter') +
       daemonset.mixin.metadata.withNamespace($._config.namespace) +
-      daemonset.mixin.metadata.withLabels(podLabels + $._config.nodeExporter.labels) +
+      daemonset.mixin.metadata.withLabels(podLabels) +
       daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
       daemonset.mixin.spec.template.metadata.withLabels(podLabels) +
       daemonset.mixin.spec.template.spec.withTolerations([existsToleration]) +
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index 80ae5fbe9607753d24ca381b7675fc5a59837fb9..3e61863a7c80c92e3324d14b8b36028e1772568d 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
-    app: node-exporter
     app.kubernetes.io/name: node-exporter
     app.kubernetes.io/version: v0.18.1
   name: node-exporter
@@ -10,11 +9,13 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: node-exporter
+      app.kubernetes.io/name: node-exporter
+      app.kubernetes.io/version: v0.18.1
   template:
     metadata:
       labels:
-        app: node-exporter
+        app.kubernetes.io/name: node-exporter
+        app.kubernetes.io/version: v0.18.1
     spec:
       containers:
       - args:
diff --git a/manifests/node-exporter-service.yaml b/manifests/node-exporter-service.yaml
index f2bec65dd81199fd64194d64a0dcd79c30c8a315..174bc0fea5d96b8e9a6226b1ee5f9eb42af5e798 100644
--- a/manifests/node-exporter-service.yaml
+++ b/manifests/node-exporter-service.yaml
@@ -13,4 +13,5 @@ spec:
     port: 9100
     targetPort: https
   selector:
-    app: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/version: v0.18.1