diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 9189f688ca95ccc99938fa1f9178478611d1252d..6619f3b589b159229ee5136a2962bc13ad119da8 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.incident_management_alerts_total_uniq
 description: Count of unique users per week 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: 7d
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 466e1c3663df1150438ce00a6bd78929f2e1e31c..206d60d0d5faf3cf510234a224c6b1f3144634e5 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.incident_management_incidents_total_u
 description: Count of unique users per week 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: 7d
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index 806f43bce1709ba21bc9e08e765fde05839efafc..3544fc588ab2ddb7d227695c1efd47da4dd5a0c9 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.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 per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index 8493e394a955cc9014590644f67cec86b1ab920f..3d445f35d1e86bdc85758a65ae2138c54fe81e48 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.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 week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index a7fb949f143ae5bd835f277dd54747b32f431283..a1a50161e89f49a4f21f02962fdb2c2d73a35b17 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.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 week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 93cdf3305b0b29b3bb018524dd68bbbdd471f830..a92021aeaa175fcc7ea1d66d7742934b951a4062 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cr
 description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index e23e7554856654c9bcdaa855a0ae39515b5f5134..816656f496d75003654c10efce5fd99231acb7a7 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_re
 description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index 48ea4c288f238ec1d38b306493852a4462e39c5c..86dafcb5bf65a74569186f74fff8dc39c9a86cb7 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_cl
 description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index e6078fbdf7df6e4969e81e245192960ed5008841..2730c5bd78d7160e96da2691f583c6c60adbb98d 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_as
 description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index 733866a55eb1ff05cdf516f8e6dc6a664e4e36ab..c5182fdf3837947a75767709ef26d20c5cebe9b9 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.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 week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index 8135df8ea755ee90c2e43ca22c99d35a10e16d5a..6ed301e77a9c75574b5cfefe8eb9341e87a9ad95 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_co
 description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index 3955cd6643394b1e60d4a32d2eec2940570a0db6..2ffd93a7db2721c94c78482302342804d415cf39 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_zo
 description: Count of unique users creating Zoom meetings about incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index 0d4b71686d9ee4fa4803359344574a02edc0675e..3b83e6728aede1fe58c401f8ea2650e0ba1c5e71 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding issues per that are related to an inci
   week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index 3e5c43746f020f633b14bbff28b5a79eb403c9d8..e3fcae1814fabde312d8a36a52855da916561fae 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users removing issue that are related to an inciden
   per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 23d777530f4b754a2f1c1d86ac38c29d69f1a31c..9a15687c5c0d7c9f9cbdda8bbb28276e4b43c57f 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_ch
 description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index f0dbaae8c0c78eca2429779d170a0818d5c325d6..85180fbfe5df3379ee88f47d5479d5a7f81c3c01 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_total_uniqu
 description: Count of unique users performing events related to the incident management
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index bca64798d7c462c27a7b3cc48a2c9ce842900724..a1b08d46b9ce1543fdb8068184ed2ef5427af1b7 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users per week 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: 7d
diff --git a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
index a2c698ddf5bdf7e8968e6b5edfe28737b9cbf0c6..fa39e9459b14f5f6bb66eb025e6725b324d426ed 100644
--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_severity_weekly
 description: Count of WAU 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_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
index 9b767fd27d61af54d4ac78a2879b530468e46b76..cfc8db49879264b46d904a5ff352e293adf250d8 100644
--- a/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
+++ b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_incident_wee
 description: Count of WAU using the `/severity` 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/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 63dbbc67870e5730d4cc6e629cdc65ffc2f9c8f9..ab2b572d9e6fb8389c65bb1ebc23d3163f10d02a 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_from_gitlab_error_tracking_ui
 description: Count of issues manually created from the GitLab UI on Sentry errors
 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/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index b4fd354b86a27980d32595e6e0399b9394c82dfd..4cc5822707fead626791e70c710cb781c17ec15b 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -5,7 +5,7 @@ description: Count of issues where a user have added AND removed a zoom meeting
   slash commands
 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/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index 8ba4e5d6987fce75c74ce1ada08afbd3fff2465e..82ad0945c8e52d64aaeb88242625ec234b7cb201 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_with_embedded_grafana_charts_approx
 description: Count of issues where a user has embedded a Grafana chart
 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/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index fa3e8a5b7ab21dfaa47ba670cd77bdc728b3dd84..78ed2be67732f38c1abb38dbf9719eda0eb22ce2 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_from_alerts
 description: Count of issues created automatically on alerts from GitLab-Managed 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/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index da68ae832d98f15c8a6a498b319281ddd914bbec..c2fec6626b647f2e2e6b532e69ca7b23cb3bfc3b 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_gitlab_alerts
 description: Count of all issues created from GitLab alerts (bot and non-bot)
 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/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index c9dccae903a396c5605cfd6ded99aceb158280eb..0b576aa1d4d333db55e193d67ae94b6398690625 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -4,7 +4,7 @@ key_path: counts.issues_created_manually_from_alerts
 description: Count of issues created manually by non-bot users from GitLab alerts
 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/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index 9f7767619cb240bcfabdeb3310d42a5c65a7555c..03e8730a5807df2cf7b944034077bcd728145194 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.alert_bot_incident_issues
 description: Count of issues created by the alert bot automatically
 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/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index b179c2808f8bcdf6df4373782d719294fb2b7802..bf01c371a23378a495ff278a251192818d6e00ea 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_creating_incidents
 description: Counts of Projects that have incident issues, regardless of status.
 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/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index 628ddcc0104851eedbfedcafdb50e89565d854d2..e31651a23e3917979438497caf0bb33c57b4b2e0 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_alerts_created
 description: Count of projects with alerts created in given time period
 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/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index 9309929f1a0a43d83a7b71c41f8994aefea76b33..97eb3823d610c500a3daab0f51245f2e0c3b1161 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_error_tracking_enabled
 description: Projects where error tracking is enabled
 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/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 0ea0d53cf0fe9d5c57f1f6cc6c7911c82ccc652d..786ad386a341914a5c23e493c18f797a6ffccaee 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_alert_incidents
 description: Count of unique projects with an incident from an alert
 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/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 787c2d35d47a8ef6b316c4fb7924f8deef54f01d..29e9de5a5448efde0572e5152bb75eeb1ca83ae8 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_prometheus_active
 description: Count of groups 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/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index ba06004d6ecca36b268820033e3394954b4558b5..ff3f4a48a7fce292665e673e56cb24b3ff7964c3 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 4da9dcb236febe7bcd39aac8a9e440b76895448d..aef0d040117d9a5015af0dcd2f11cdd7ec011ba5 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting 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/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index e204dc6941e65308158a037597dc42fcb3175944..907d31d7257802efe96a20d7973ef12cb73d6f5c 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting 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/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index a352352fb0dbc7948e0da77911474c927686ffbb..c62b7f7bd0befa86ed9a12706a2e9ee8cb827f42 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: counts.operations_dashboard_default_dashboard
 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: all
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 47ee0e3a14407bb4af0481d3608fd3bc003f0ff9..6ff8895206497ab63b91a68bef2e35ac3e74be36 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.operations_dashboard_default_dashboard
 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: all
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 7da2a9d12f29bda0ed8e56aeea171581ad3ad277..b7546f359c148f2149d83f2511eda59937fef189 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.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: all
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index eead64bd627284ba82de7e6d46fa2bd46e30e354..8198a0ba3b882f00539cc2feb73719c94abee9a0 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_with_enabled_alert_integratio
 description: Histogram (buckets 1 to 100) of projects with at least 1 enabled integration.
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: object
 status: active
 milestone: "13.10"
diff --git a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
index b4eb01780e0e1543abec1ff14e97f62fc6a09a54..c653820a123e242c4cbafcc7ecc9f2eaad2e37c9 100644
--- a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_pu
 description: Count of unique users that published 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/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
index d631324df213af6eb9895c11d3647f92eeae2e53..b739144873881fd2e7e64707ac155ca3ee7d2c27 100644
--- a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_publish_monthly
 description: Count of MAU using the `/publish` quick action
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml b/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
index ac701388b6cbd19e8e6f312673c10628729ab6d8..ce81d7d659952e75261b2f3c85fc0bf405dc0461 100644
--- a/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management_oncall.i_incident_management_on
 description: Count of unique users to receive a notification while on-call
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
index 523dc69b4dd7f52996f15978b45eb5272d56f8fd..2929d53a5af1f5bd007a2a2b460c3c3c0cc1b043 100644
--- a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management.incident_management_incident_pu
 description: Count of unique users that published incidents per week
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
index dfc036ba560e0490418d3a0e825d5325b1902e22..e66dd3f2850702d5ea654e931b926bf5127c611b 100644
--- a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_publish_weekly
 description: Count of WAU using the `/publish` quick action
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 7d
diff --git a/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml b/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
index 4fc473d5e1cb8fd7c88aaa253347ef872a79848b..80bdd182994ab3a8231774ad46c6ead45175b45b 100644
--- a/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.incident_management_oncall.i_incident_management_on
 description: Count of unique users to receive a notification while on-call
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
index a2fd0eada238a4efbabe7e6666e73956ab703b23..47170e4c9addda2ee9bd6d767a0b7fa812f213d7 100644
--- a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
+++ b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
@@ -4,7 +4,7 @@ key_path: counts.status_page_incident_publishes
 description: Cumulative count of usages of publish operation
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
index bc73b069ac62f7fa002bd3a45da7215593c73599..7025561d723a7db17fbea6c1696368a1ab2b13e9 100644
--- a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
+++ b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
@@ -4,7 +4,7 @@ key_path: counts.status_page_incident_unpublishes
 description: Cumulative count of usages of unpublish operation
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
index 75e9695764a59932e5369e182e2a9fb682649a47..371e06343f206ded8347fad9cbba714c9931a0aa 100644
--- a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
+++ b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
@@ -4,7 +4,7 @@ key_path: counts.status_page_projects
 description: Projects with status page enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
index 8aefd280ee5f275bc89b83864a2bbcbfeeaf32f2..6e910b031045cbd0a5bda2a42967bdc451bdb676 100644
--- a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
+++ b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
@@ -4,7 +4,7 @@ key_path: counts.status_page_issues
 description: Issues published to a Status Page
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
index 8c67988a29fc9549686c83bbb0729d4d81f4e0c3..0b9c3240e5d61bca2b3556781302b02d2fcd14c7 100644
--- a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.monitor.projects_incident_sla_enabled
 description: Projects where Incident SLA is enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
index 5ff3772129afca154b4de1609560c667453a2f3c..47005716407f1e558bf11e0c817267ecfdefbf24 100644
--- a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
 description: Count of projects with Incident SLA enabled
 product_section: ops
 product_stage: monitor
-product_group: monitor
+product_group: respond
 value_type: number
 status: removed
 time_frame: all