diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index f846944a18f87914a31273cc905172e793cc7532..9d0b5f8ed191a489d4864b526054cf9ccce5530e 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.incident_management_alerts_total_uni
 description: Count of unique users per month to take an action on an alert
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index 4a020dd074229444dc291567b5014da269863716..7a92a8a2af779ce0e0a711c2d2084d0be22ed8fb 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.incident_management_incidents_total_
 description: Count of unique users per month to take an action on an incident
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index 6cfec1068bfbe526c80f650aaacdb8fad80ba5b2..c96b444783ba5d76d05b6f9e0c039f8cdab232de 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_incidents
 description: Count of unique projects with an incident created in the last month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index ee7f226f63b0351f83a12a1bb1ae7df3583879e6..5afb0a3001b667995d16cd7460bbab9c7f58e263 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -5,7 +5,7 @@ description: Count of unique projects with an incident from an alert created in
   last month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index bb3aba1ea1c56f76ed414fe0b9e172aea501d4b9..6b4d949a572f977c4d06960e3723d64f90837463 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_statu
 description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index fbb2c10e7ce869205bacd17c9172232b96375f68..41d6ae91956c79b9d3f054662e9a8ec453aa3ed7 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_assig
 description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index 4e2f099630194ead117369a0e2cb94c2e83de97d..d18e8b6a22841f106e8babf77a0414b955cdfb1c 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_alert_todo_
 description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index c2c0d3dad8af23f6ecc0d0cbfb3ef5fecbdca302..ba09828dfd50118fa2ab98a364d7bec1f4f2c8ec 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cr
 description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index e476a14f13ae6afc9ed825b503018e48ed877d14..69319d8a00bd5a76d1fc70166a0687de9b55d7d3 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_re
 description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index 7d64e5b3207b4a2a6270b8deee8a48c63165114c..5437d4271c674e380d6a94497e2efbeff55c9c7b 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cl
 description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index 2f1fc2fe103f34fef933e8bc8d70ff889c90f301..3ec5a2237adc031a5ccf539ca9463b7c6ffeef55 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_as
 description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index 876d41f774c482f846049a4d629a85db5d29ebb3..82f691abc409bb751c96c6e5200791183d96c5c3 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_to
 description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index dda9bc78e8dd5f7fc1f374f9f69e3a2829af1ecf..b233b9c2db576f348dc1eb564a72ed57c6ac2f09 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_co
 description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index 35b30aa260c30a836216400a02a4324a5f80d67e..913bf7c5d94a88f47f288265dbd6262640b9474e 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_zo
 description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index 99a2d5fc88a6e52a55357f56b6d1f761d6953a12..9a7c35095ec4ee142bbb1693c7abdeb5f209d032 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding issues per month that are related to a
   incident
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index 3859db8db400d5d5d416adeb35fa40c646fe9ab7..1d1a9ac70c7c59dd2d0937b7e94a988225d967f1 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_un
 description: Count of users removing issues that are related to an incident per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index d32b4e85d1bc296d809c859e80ea19bbd97672c2..aadcc7fad8bd5bde589b0218db593167c4fe96d5 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_ch
 description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 28a9d320746487776a0c79740992dff59138b532..1944fb13a1a3584b17bb2c5fd16e8dd1f613f615 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_total_uniqu
 description: Count of unique users performing events related with incidents per month
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index ad0cbac593e208a9b044b36284ea82a7998907b2..465069b3e6a0f22e2883b638741bfe81b7a463b1 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users per month to create an incident corresponding
   an alert
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index 3940428db10eecacb137e0e6d7b334f4fd019af0..8bb0227fe78cf69f9a6b07de7536970664f78bd1 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_ale
 description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index 33b35d0ad1cc26627de0e46a37a42864db606e10..ecf59fb63d8b7d85afd7e8fe784349fbb176d9e4 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 19c12861873a866e0e7b5e0c627e18e2fdd7ea95..5451ddd2bfef5a949d3af440b1516cef0c7429e8 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_promethe
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 56cb1df8724dd988013341a7e8fb71f06da7b3e6..fe4798dd109cfb95d225aa6ba9df997f124ddce9 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_d
 description: Active users with enabled operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index ed10a48198804d0d135e3dbf10764f6c856b710b..7cb5b6457ddeefea8c08b1eee8fa2225aae947a6 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index 76ff3d7a8340e509bde570668c1a13ca8c3e4210..8f104b9caea28c7e88e987da3a1c830f5ea75e64 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_e
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index a4770212223cf55a627bea904a57175116fb165d..4d72e75d367157b42085fe8e849f323211e10bea 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_wit
 description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index 3da0d3ce4df37f7fb703136dab92470f17868b2c..c5a928655d810fa743d48db1ed9f0617900a504d 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -4,7 +4,7 @@ key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
index b5a83d81c0ae61c9d48bc19b4a1a0961e94bdd28..cd80e6389c9dccc7b5f89b0bde416e98f944d0b6 100644
--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_severity_monthly
 description: Count of MAU using the `/severity` quick action
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
index 2b46ab9291025e38ab0fda7c38f03531d1d33cc1..aef4a2ccc5f078407fc4c02ff602937f55b7b8c9 100644
--- a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.clusters_integrations_promethe
 description: Users creating clusters with Prometheus integration enabled in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
index 51e3dbcc9eb6e16b5e4b9145921e06bbd199b16b..887ff2d40746fce1ab7b257dd0c7cbdd351be281 100644
--- a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
+++ b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_mon
 description: Count of MAU using the `/promote_to_incident` quick action
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index c22277c98aa5842eb0d985c033a2e49e70f4cda3..e6344f41124ed812dfb4f7a0782152fec0573226 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
index 81157c0e40b6a4b4b9da4d42a63e1756a615eb5e..0b005361cda1bfc4ccc71803b812aa1140254a44 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -4,7 +4,7 @@ key_path: counts.pod_logs_usages_total
 description: Count the total number of log views
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index f0d5c931d00044f92bd61740b03476d20b99be6c..1f46b9178d097de2cb15ddf45794f2fde441333c 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_with_associated_zoom_link
 description: Count of issues where a user has linked a Zoom meeting
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index 0767efa0a07f265c35196e6dd51b90aa744342c7..8d2a6c46ad515e82641489f4566c3222b6a7ae14 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.incident_issues
 description: Count of incidents (issues where issue_type=incident)
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index 4f988259a5a11c79a4a4fb9c422cc43b8a6e45bb..d2a0b723be9d63bb8b4527eb4ffa0656a7446af2 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.incident_labeled_issues
 description: Count of all issues with the label=incident
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index 489856768acbbd45c9d5220df654bbb875c3199d..914f86f9ac400ce4049a940b6bef514174d3630d 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_error_tracking_enabled
 description: Count of projects that have enabled Error tracking via Sentry
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index cc7d6db5d979c85a583b7ae2a06ccf9f4182531b..21cb043fc21a1c5ce18f950ff12d1e416aa26e3c 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_alerts_service_enabled
 description: Count of projects that have enabled the Alerts service
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 3f632bf906a923c400abe9ce0bc8ab1839ea94a5..c5f326eac4f74f4c0f1f80b5323ca8297f56e7bd 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_enabled_alert_integrations
 description: Count of projects with at least 1 enabled integration
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index a11bf9453d7ba35ee289375d475d29f3e99c0d79..d4f30958e76ca3a9e75fc884533b17ead053dfa8 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_incidents
 description: Count of unique projects with an incident
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 901e609875cbb1d2edc1907111e8216ef225742b..453c9b5b628975226b3bc27d7c8ccbe961b6704c 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -4,7 +4,7 @@ key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index e2b4b35afcd993157fcd7b4baec854d492f1a039..600864d7e84854fdecd068c1d13040c887e314ad 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index b4ca69f057b9f547f870c6ca6756786eb3db2ea5..b97cc97c6c22999c66f1b6aaf77285bc607116c6 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index ff8b929ee49ce7be40dd195e439263bbccdc7b0b..ad78d917c8e9ef89d31beeb0f343104296376539 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index af7fb206fe13dde3f70945bb5b2531945b298667..e4788e77965277b44fceac5406d4d2d465532d18 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -4,7 +4,7 @@ key_path: counts.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index d6bc0b5cd967c6dd15a27393c3daba54d45d8483..c305c7a0d79e7ab5997de1e451fe48ffa2d80c20 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters
 description: Users creating clusters.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index 212f8c211330ad6399eac2c37420c01b3f511a77..af48b08b9ef8f2b34bf82e8a33d6efd57cbda1b9 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 0744fa2e829ee089bdc6cc1ce05861f509474f0b..7f9001009f5e7463cf9a27613ff9d808a03a8b91 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.operations_dashboard_users_with_projec
 description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
index 11623fa361a9f068ad400215e50c18d400f06798..41736a16e7edea5b72c9b078077c672787dcd830 100644
--- a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.clusters_integrations_prometheus
 description: Users creating clusters with Prometheus integration enabled in last 28 days.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all