diff --git a/dp-terraform/helm/rhacs-terraform/charts/observability/templates/01-operator-03-secret-alertmanager.yaml b/dp-terraform/helm/rhacs-terraform/charts/observability/templates/01-operator-03-secret-alertmanager.yaml
index 81120980ae..0149ca5c0b 100644
--- a/dp-terraform/helm/rhacs-terraform/charts/observability/templates/01-operator-03-secret-alertmanager.yaml
+++ b/dp-terraform/helm/rhacs-terraform/charts/observability/templates/01-operator-03-secret-alertmanager.yaml
@@ -12,6 +12,7 @@ stringData:
       repeat_interval: 12h
       group_by:
       - cluster_id
+      - severity
       routes:
       - receiver: managed-rhacs-deadmanssnitch
         repeat_interval: 5m
@@ -21,9 +22,10 @@ stringData:
           observability: managed-rhacs
       - receiver: managed-rhacs-pagerduty
         group_by:
-        - rhacs_instance_id
+        - namespace
+        - severity
         matchers:
-        - "rhacs_instance_id =~ \".*\""
+        - "namespace =~ \"rhacs-.*\""
     receivers:
     - name: managed-rhacs-pagerduty
       pagerduty_configs: