diff --git a/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml b/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml
index f9554ce..db7c0eb 100644
--- a/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml
+++ b/charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml
@@ -16,7 +16,7 @@ stringData:
         access: proxy
         editable: false
         type: prometheus
-        url: http://thanos-query.{{ .Values.user }}-monitoring.svc.cluster.local:10902
+        url: http://thanos-query:10902
         version: 1
       {{- if .Values.grafana.datasources }}
       {{- toYaml .Values.grafana.datasources | nindent 6 }} 
diff --git a/charts/user-monitoring/templates/_user-grafana-servicemonitor.yaml b/charts/user-monitoring/templates/_user-grafana-servicemonitor.yaml
new file mode 100644
index 0000000..b257bb5
--- /dev/null
+++ b/charts/user-monitoring/templates/_user-grafana-servicemonitor.yaml
@@ -0,0 +1,23 @@
+{{- define "grafana.servicemonitor" }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: grafana-monitor
+spec:
+  endpoints:
+    - basicAuth:
+        password:
+          name: basic-auth
+          key: {{ .Values.user }}
+        username:
+          name: basic-auth
+          key: grafana_user
+      interval: 60s
+      port: http
+      scheme: http
+      path: /metrics
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: grafana
+{{- end }}
\ No newline at end of file
diff --git a/charts/user-monitoring/templates/monitoring.yaml b/charts/user-monitoring/templates/monitoring.yaml
index 20df5da..2c28402 100644
--- a/charts/user-monitoring/templates/monitoring.yaml
+++ b/charts/user-monitoring/templates/monitoring.yaml
@@ -19,6 +19,7 @@
   {{- template "grafana.svc" . }}
   {{- template "grafana.sa" . }}
   {{- template "grafana.deploy" . }}
+  {{- template "grafana.servicemonitor" . }}
   {{- template "grafana.ingress" . }}
 {{- end }}