diff --git a/grafana/values.yaml b/grafana/values.yaml
index c1272c61ac..6a263e72b4 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -3313,67 +3313,6 @@ conf:
             text: HEALTHY
             value: '1'
           valueName: current
-        - cacheTimeout:
-          colorBackground: false
-          colorValue: true
-          colors:
-          - rgba(245, 54, 54, 0.9)
-          - rgba(237, 129, 40, 0.89)
-          - rgba(50, 172, 45, 0.97)
-          datasource: prometheus
-          editable: true
-          error: false
-          format: none
-          gauge:
-            maxValue: 100
-            minValue: 0
-            show: false
-            thresholdLabels: false
-            thresholdMarkers: true
-          id: 14
-          interval: 1m
-          isNew: true
-          links: []
-          mappingType: 1
-          mappingTypes:
-          - name: value to text
-            value: 1
-          - name: range to text
-            value: 2
-          maxDataPoints: 100
-          nullPointMode: connected
-          nullText:
-          postfix: ''
-          postfixFontSize: 50%
-          prefix: ''
-          prefixFontSize: 50%
-          rangeMaps:
-          - from: 'null'
-            text: N/A
-            to: 'null'
-          span: 2
-          sparkline:
-            fillColor: rgba(31, 118, 189, 0.18)
-            full: false
-            lineColor: rgb(31, 120, 193)
-            show: false
-          targets:
-          - expr: ceph_mon_quorum_count{application="ceph",release_group="$ceph_cluster"}
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: ''
-            refId: A
-            step: 60
-          thresholds: '2,3'
-          title: Monitors In Quorum
-          transparent: false
-          type: singlestat
-          valueFontSize: 100%
-          valueMaps:
-          - op: "="
-            text: N/A
-            value: 'null'
-          valueName: current
         - cacheTimeout:
           colorBackground: false
           colorValue: false
@@ -4612,7 +4551,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osd_up{ceph_daemon="osd.$osd",application="ceph",release_group="$ceph_cluster"}
+          - expr: ceph_osd_up{ceph_daemon="$osd",application="ceph",release_group="$ceph_cluster"}
             interval: "$interval"
             intervalFactor: 1
             refId: A
@@ -4685,7 +4624,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osd_in{ceph_daemon="osd.$osd",application="ceph",release_group="$ceph_cluster"}
+          - expr: ceph_osd_in{ceph_daemon="$osd",application="ceph",release_group="$ceph_cluster"}
             interval: "$interval"
             intervalFactor: 1
             refId: A
@@ -4820,10 +4759,10 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_osd_numpg{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"}
+          - expr: ceph_osd_numpg{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Number of PGs - {{ osd.$osd }}
+            legendFormat: Number of PGs - {{ $osd }}
             refId: A
             step: 60
           - expr: avg(ceph_osd_numpg{application="ceph",release_group="$ceph_cluster"})
@@ -4901,7 +4840,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"}/ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"})*100
+          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"}/ceph_osd_stat_bytes{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"})*100
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -4961,18 +4900,18 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"}
+          - expr: ceph_osd_stat_bytes_used{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"}
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Used - {{ osd.$osd }}
             metric: ceph_osd_used_bytes
             refId: A
             step: 60
-          - expr: ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"} - ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"}
+          - expr: ceph_osd_stat_bytes{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"} - ceph_osd_stat_bytes_used{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"}
             hide: false
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Available - {{ osd.$osd }}
+            legendFormat: Available - {{ $osd }}
             metric: ceph_osd_avail_bytes
             refId: B
             step: 60
@@ -5037,10 +4976,10 @@ conf:
           stack: false
           steppedLine: false
           targets:
-          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"}/ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd",application="ceph",release_group="$ceph_cluster"})
+          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"}/ceph_osd_stat_bytes{ceph_daemon=~"$osd",application="ceph",release_group="$ceph_cluster"})
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Available - {{ osd.$osd }}
+            legendFormat: Available - {{ $osd }}
             metric: ceph_osd_avail_bytes
             refId: A
             step: 60
@@ -5163,7 +5102,7 @@ conf:
           multi: false
           name: osd
           options: []
-          query: label_values(ceph_osd_metadata{release_group="$ceph_cluster"}, id)
+          query: label_values(ceph_osd_metadata{release_group="$ceph_cluster"}, ceph_daemon)
           refresh: 1
           regex: ''
           type: query