diff --git a/ansible-scylla-monitoring/templates/rule_config.yml.j2 b/ansible-scylla-monitoring/templates/rule_config.yml.j2
index a37a6b53..93865aad 100644
--- a/ansible-scylla-monitoring/templates/rule_config.yml.j2
+++ b/ansible-scylla-monitoring/templates/rule_config.yml.j2
@@ -50,7 +50,7 @@ receivers:
     auth_password: {{ alerts_sender_password }}
     send_resolved: false
     headers:
-      Subject: '[PRODUCTION] NORMAL Managed-Services - Cluster:{{ scylla_cluster_name }}'
+      Subject: '[PRODUCTION] {{ '{{ .CommonLabels.alertname }}' }} {{ '{{ .CommonLabels.severity }}' }}: NORMAL Managed-Services - Cluster:{{ scylla_cluster_name }}'
 - name: team-X-mails-urgent
   email_configs:
   - to: {{ alerts_receiver_email }}
@@ -61,9 +61,9 @@ receivers:
     auth_password: {{ alerts_sender_password }}
     send_resolved: false
     headers:
-      Subject: '[PRODUCTION] URGENT Managed-Services - Cluster:{{ scylla_cluster_name }}'
+      Subject: '[PRODUCTION] {{ '{{ .CommonLabels.alertname }}' }} {{ '{{ .CommonLabels.severity }}' }}: URGENT Managed-Services - Cluster:{{ scylla_cluster_name }}'
 route:
-  group_by: ['severity']
+  group_by: [alertname, 'severity']
   group_interval: 5m
   group_wait: 30s
   repeat_interval: 6h