diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet
index 4dfe516cb329636b4e0ad7851988385d33cbf206..06d5bef3de3516081e283e1615e5b92eb5b9aa02 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 59099c4d88b5ee7e0a5eed3a9680ed9e181eec75..e34ee23b7215c7088c6d008653db9434067aaffd 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