diff --git a/charts/user-monitoring/templates/_user-am-servicemonitor.yaml b/charts/user-monitoring/templates/_user-am-servicemonitor.yaml
new file mode 100644
index 0000000..f21f31c
--- /dev/null
+++ b/charts/user-monitoring/templates/_user-am-servicemonitor.yaml
@@ -0,0 +1,21 @@
+{{- define "alertmanager.sm" }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app.kubernetes.io/name: mariadb
+  name: alertmanager
+spec:
+  endpoints:
+    - interval: 60s
+      port: web
+      scheme: http
+      path: /metrics
+  namespaceSelector:
+    matchNames:
+    - {{ .Values.user }}-monitoring
+  selector:
+    matchLabels:
+      operated-alertmanager: 'true'
+{{- end }}
\ No newline at end of file
diff --git a/charts/user-monitoring/templates/_user-am.yaml b/charts/user-monitoring/templates/_user-am.yaml
index 93b8c5a..a705937 100644
--- a/charts/user-monitoring/templates/_user-am.yaml
+++ b/charts/user-monitoring/templates/_user-am.yaml
@@ -4,7 +4,23 @@ apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .Values.user }}-am
-  name: {{ .Values.user }}-am
-spec: {}
+    app.kubernetes.io/name: {{ .Values.user }}-alertmanager
+  name: {{ .Values.user }}-alertmanager
+spec:
+  alertmanagerConfigNamespaceSelector:
+    matchNames:
+    - {{ .Values.user }}-monitoring
+  alertmanagerConfigSelector:
+  image: quay.io/prometheus/alertmanager:v0.25.0
+  replicas: 2
+  resources:
+    requests:
+      cpu: 10m
+      memory: 40Mi
+  storage:
+    volumeClaimTemplate:
+      spec:
+        resources:
+          requests:
+            storage: 100Mi
 {{- end }}
\ No newline at end of file
diff --git a/charts/user-monitoring/templates/_user-blackboxexporter-deploy copy.yaml b/charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml
similarity index 100%
rename from charts/user-monitoring/templates/_user-blackboxexporter-deploy copy.yaml
rename to charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml
diff --git a/charts/user-monitoring/templates/_user-thanosruler.yaml b/charts/user-monitoring/templates/_user-thanosruler.yaml
index 360b5a8..92ad8f7 100644
--- a/charts/user-monitoring/templates/_user-thanosruler.yaml
+++ b/charts/user-monitoring/templates/_user-thanosruler.yaml
@@ -7,12 +7,24 @@ metadata:
     app.kubernetes.io/name: thanos-ruler
   name: thanos-ruler
 spec:
+  image: quay.io/thanos/thanos:v0.28.1
   alertQueryUrl: {{ .Values.user }}-thanos-query.training.cluster.acend.ch
   evaluationInterval: 10s
   queryEndpoints:
-  - thanos-query.{{ .Values.user }}-monitoring.svc.cluster.local:10902
+  - dnssrv+_http._tcp.thanos-querier.{{ .Values.user }}-monitoring.svc.cluster.local
   ruleSelector: {}
   ruleNamespaceSelector:
     matchLabels:
       user: {{ .Values.user }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: thanosruler-alertmanager-config
+stringData:
+  alertmanager-configs.yaml: |-
+    alertmanagers:
+    - static_configs:
+      - "dnssrv+_web._tcp.alertmanager-operated.{{ .Values.user }}-monitoring.svc.cluster.local"
+      api_version: v2```
 {{- end }}
\ No newline at end of file
diff --git a/charts/user-monitoring/templates/monitoring.yaml b/charts/user-monitoring/templates/monitoring.yaml
index 18b8f7c..4b902a0 100644
--- a/charts/user-monitoring/templates/monitoring.yaml
+++ b/charts/user-monitoring/templates/monitoring.yaml
@@ -2,10 +2,11 @@
 
 {{- if .Values.alertmanager.enabled }}
   {{- template "alertmanager.alertmanager" . }}
+  {{- template "alertmanager.servicemonitor" . }}
   {{- template "alertmanager.config-mailcatcher" . }}
   {{- template "mailcatcher.deploy" . }}
   {{- template "mailcatcher.svc" . }}
-  {{- template "mailcatcher.ingress" . }}
+  {{- template "mailcatcher.ingress" . }} 
 {{- end }}
 
 # blackboxexporter