diff --git a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml
index a83840f3..5f7b44ae 100644
--- a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml
+++ b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchLabels:
+      grafana: grafana-oauth
   json: >-
     {
     "annotations": {
diff --git a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml
index 25d986fa..f4ef3027 100644
--- a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml
+++ b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchLabels:
+      grafana: grafana-oauth
   json: >-
     {
     "annotations": {
diff --git a/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml b/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml
index 74cdeddf..0b077d75 100644
--- a/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml
+++ b/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml
@@ -5,20 +5,20 @@ metadata:
   name: prometheus-grafana-datasource
 spec:
   name: prometheus.yaml
-  datasources:
-    - access: "proxy"
-      basicAuth: true
-      basicAuthPassword: {{ .Values.openshift_prometheus_basic_auth_pass }}
-      basicAuthUser: "internal"
-      editable: false
-      jsonData:
-        tlsSkipVerify: true
-      name: "prometheus"
-      orgId: 1
-      type: "prometheus"
-      {{- if .Values.bucket_access_point }}
-      url: "https://thanos-pelorus.{{ .Release.Namespace }}.svc:9092"
-      {{- else }}
-      url: "https://prometheus-pelorus.{{ .Release.Namespace }}.svc:9091"
-      {{- end }}
-      version: 1
+  datasource:
+    access: "proxy"
+    basicAuth: true
+    basicAuthPassword: {{ .Values.openshift_prometheus_basic_auth_pass }}
+    basicAuthUser: "internal"
+    editable: false
+    jsonData:
+      tlsSkipVerify: true
+    name: "prometheus"
+    orgId: 1
+    type: "prometheus"
+    {{- if .Values.bucket_access_point }}
+    url: "https://thanos-pelorus.{{ .Release.Namespace }}.svc:9092"
+    {{- else }}
+    url: "https://prometheus-pelorus.{{ .Release.Namespace }}.svc:9091"
+    {{- end }}
+    version: 1
diff --git a/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml b/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml
index 1932138f..aa348f15 100644
--- a/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml
+++ b/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml
@@ -2,6 +2,8 @@
 apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana
 metadata:
+  labels:
+    grafana: grafana-oauth
   name: grafana-oauth
 spec:
   config: