diff --git a/k8s/core/prom-stack/grafana-alerting-configmap.yaml b/k8s/core/prom-stack/grafana-alerting-configmap.yaml
index 7e75bfa..2d0ee84 100644
--- a/k8s/core/prom-stack/grafana-alerting-configmap.yaml
+++ b/k8s/core/prom-stack/grafana-alerting-configmap.yaml
@@ -52,8 +52,11 @@ data:
             execErrState: Alerting
             for: 5m
             annotations:
-              description: 'Throttling rate: {{ printf "%.2f" $values.A }}'
-              summary: 'VPN node throttling CPU on {{ $labels.node }}'
+              pod: '{{ $labels.pod }}'
+              node: '{{ $labels.node }}'
+              namespace: '{{ $labels.namespace }}'
+              throttle_rate: '{{ printf "%.2f" $values.A }}'
+              summary: 'VPN node throttling CPU'
             labels:
               severity: warning
   
@@ -74,15 +77,15 @@ data:
                 
                 {{ range .Alerts }}
                 📊 <b>{{ .Labels.alertname }}</b>
-                {{ if .Annotations.summary }}{{ .Annotations.summary }}{{ end }}
+                {{ .Annotations.summary }}
                 
                 🎯 <b>Details:</b>
-                • Pod: <code>{{ .Labels.pod }}</code>
-                • Node: <code>{{ .Labels.node }}</code>
-                • Namespace: <code>{{ .Labels.namespace }}</code>
-                {{ if .Annotations.description }}• {{ .Annotations.description }}{{ end }}
+                • Pod: <code>{{ .Annotations.pod }}</code>
+                • Node: <code>{{ .Annotations.node }}</code>
+                • Namespace: <code>{{ .Annotations.namespace }}</code>
+                • Throttling rate: {{ .Annotations.throttle_rate }}
                 
-                🔗 <a href="{{ .SilenceURL }}">Silence</a> | <a href="{{ .DashboardURL }}">Dashboard</a>
+                🔗 <a href="{{ .GeneratorURL }}">View in Grafana</a>
                 {{ end }}
               parse_mode: HTML