diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet
index 4dfe516c..06d5bef3 100644
--- a/jsonnet/kube-prometheus/components/grafana.libsonnet
+++ b/jsonnet/kube-prometheus/components/grafana.libsonnet
@@ -73,7 +73,7 @@ function(params) {
     spec: {
       selector: {
         matchLabels: {
-          app: 'grafana',
+          'app.kubernetes.io/name': 'grafana',
         },
       },
       endpoints: [{
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 59099c4d..e34ee23b 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -14,4 +14,4 @@ spec:
     port: http
   selector:
     matchLabels:
-      app: grafana
+      app.kubernetes.io/name: grafana