diff --git a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.yaml b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.yaml
index 2dd10f1a..35aa732d 100644
--- a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.yaml
+++ b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/alertmanager-config.yaml
@@ -13,6 +13,14 @@ metadata:
   name: alertmanager-config
   namespace: freeleaps-monitoring-system
 spec:
+  route:
+    groupBy:
+    - severity
+    - namespace
+    groupInterval: 5m
+    groupWait: 30s
+    receiver: 'ms-teams'
+    repeatInterval: 12h
   receivers:
   - name: 'ms-teams'
     msteamsConfigs:
@@ -20,6 +28,6 @@ spec:
       webhookUrl: 
         key: 'webhook-url'
         name: 'freeleaps-teams-webhook'
-      title: '{{ template "msteams.default.title" . }}'
+      title: '{{ if eq .Status "firing" }}🚨 [FIRING] 🔥{{- else -}}🙌 [RESOLVED] 🍻{{- end -}}'
       text: '{{ template "msteams.default.text" . }}'