diff --git a/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml b/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
index 545f3237c19b27d0c723fd74f847cb5a8bf88c2c..9bc70dde990b2d27e9f65539a7b43f23d115c241 100644
--- a/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
+++ b/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
@@ -35,15 +35,15 @@ receivers:
         api_url: "{{ monitor_alerts_slack_url }}"
         username: 'Monitor - Alerter'
         channel: "{{ monitor_alerts_slack_channel }}"
-        text: "Instances: {% raw %}{{range .Alerts}}\n{{.Labels.nodename}} : {{.Annotations.description}}{{end}}{% endraw %}"
+        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} {{.Annotations.description}}{{end}}{% endraw %}"
         icon_emoji: ':dart:'
   {% for item in service_teams %}
-  # Dummy comment line to ensure yaml generated from ansible template has proper indentation
+  # comment line to ensure yaml generated from ansible template has proper indentation
   - name: "{{ item.team }}"
     email_configs:
       - send_resolved: true
         to: '{{ item.alerts_mailing_list }}'
         html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
         headers:
-          subject: '[{{ env }}] {% raw %}{{ template "email.default.subject" . }}{% endraw %}'
+          subject: '[{{ env }}-{{cluster_name}}] {{ .GroupLabels.alertname }}'
   {% endfor %}
diff --git a/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml b/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
index cb3e625c8c15668f5cc9b393946daa06b99427e3..db826b46305b3606013c8864ba68c569cf3425bf 100644
--- a/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
+++ b/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
@@ -36,7 +36,7 @@ receivers:
         api_url: "{{ monitor_alerts_slack_url }}"
         username: 'Monitor - Alerter'
         channel: "{{ monitor_alerts_slack_channel }}"
-        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} : {{.Annotations.description}}{{end}}{% endraw %}"
+        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} {{.Annotations.description}}{{end}}{% endraw %}"
         icon_emoji: ':dart:'
   {% for item in service_teams %}
   # comment line to ensure yaml generated from ansible template has proper indentation
@@ -46,5 +46,5 @@ receivers:
         to: '{{ item.alerts_mailing_list }}'
         html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
         headers:
-          subject: '[{{ env }}-{{cluster_name}}] {{range .Alerts}} : {{.Annotations.summary}}{{end}}'
+          subject: '[{{ env }}-{{cluster_name}}] {{ .GroupLabels.alertname }}'
   {% endfor %}