diff --git a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
index bba3ac4024d1373f423ac4b9a236b8ef3c8f8d0d..ad28a90c4bcd3d5cf2cc770c9f43b90bc626fb45 100644
--- a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
+++ b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
index 8e103c7acc2c7635c269dfa056ef96c8463efa73..d1c6942351521db4cd5c226672a9beade7085128 100644
--- a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
+++ b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
index b48e2de6055faeca864be063a2c2158d684d1f7b..240bdee037496362fe17a59b323b7eb25f497aca 100644
--- a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
+++ b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
@@ -10,15 +10,15 @@ identifiers:
 #- project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
 distributions:
 #- ce
 - ee
-tiers: 
+tiers:
 #- free
 - premium
 - ultimate
diff --git a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
index 4be2df48fb3622083397496c0307da2a43e75201..b1a92a5403296576d891e90c4799f7153afed28c 100644
--- a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
+++ b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
@@ -10,15 +10,15 @@ identifiers:
 #- project
 - user
 #- namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
 distributions:
 #- ce
 - ee
-tiers: 
+tiers:
 #- free
 - premium
 - ultimate
diff --git a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
index 31f45f21695a04822a9859175f304791691ecd19..81a970179567d85828e5e7e732748eeaa8727a7b 100644
--- a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
+++ b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
@@ -10,8 +10,8 @@ identifiers:
 #- project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
index 062f5363ef1ceded4ae23897b0de9ed1e54a44e1..703887818b6d199722737777fd95dcff567afb10 100644
--- a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
+++ b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
@@ -10,8 +10,8 @@ identifiers:
 - project
 - user
 - namespace
-product_section: dev
-product_stage: manage
+product_section: sec
+product_stage: govern
 product_group: compliance
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
diff --git a/ee/config/metrics/counts_28d/20211130085433_g_manage_compliance_audit_event_destinations.yml b/ee/config/metrics/counts_28d/20211130085433_g_manage_compliance_audit_event_destinations.yml
index 1fa8672639cfd75b179643b5218d713f30dc818a..9be9e2a1d86419bc08d3dcaeedb603d3b1ebe36d 100644
--- a/ee/config/metrics/counts_28d/20211130085433_g_manage_compliance_audit_event_destinations.yml
+++ b/ee/config/metrics/counts_28d/20211130085433_g_manage_compliance_audit_event_destinations.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.audit_event_destinations
 description: "Count of audit event streaming destinations"
-product_section: "dev"
-product_stage: "manage"
-product_group: "compliance"
+product_section: sec
+product_stage: govern
+product_group: compliance
 value_type: number
 status: active
 milestone: "14.6"
diff --git a/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml b/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
index 06612184afe0d68ae0655decdbb40cbd10d37d7b..8365d39663428f3418c734f226a7a4684871bba8 100644
--- a/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
+++ b/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.groups_with_event_streaming_destinations
 description: "Distinct count of groups with any event streaming destinations"
-product_section: "dev"
-product_stage: "manage"
-product_group: "compliance"
+product_section: sec
+product_stage: govern
+product_group: compliance
 value_type: number
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369871
diff --git a/ee/config/metrics/counts_all/20211130085433_g_manage_compliance_audit_event_destinations.yml b/ee/config/metrics/counts_all/20211130085433_g_manage_compliance_audit_event_destinations.yml
index 3da30cf4d781ebae64715f63991b639bcf3831db..a1111476a731ac96294235715e25d62a1c47830c 100644
--- a/ee/config/metrics/counts_all/20211130085433_g_manage_compliance_audit_event_destinations.yml
+++ b/ee/config/metrics/counts_all/20211130085433_g_manage_compliance_audit_event_destinations.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage.manage.audit_event_destinations
 description: "Count of audit event streaming destinations"
-product_section: "dev"
-product_stage: "manage"
-product_group: "compliance"
+product_section: sec
+product_stage: govern
+product_group: compliance
 value_type: number
 status: active
 milestone: "14.6"
diff --git a/ee/config/metrics/counts_all/20211130091657_groups_with_event_streaming_destinations.yml b/ee/config/metrics/counts_all/20211130091657_groups_with_event_streaming_destinations.yml
index f31b31382a6ddee92cc40fd1e461d6bef0269ae1..3fb8d56fb503e14a4b4151303b8386faae4603af 100644
--- a/ee/config/metrics/counts_all/20211130091657_groups_with_event_streaming_destinations.yml
+++ b/ee/config/metrics/counts_all/20211130091657_groups_with_event_streaming_destinations.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage.manage.groups_with_event_streaming_destinations
 description: "Distinct count of groups with any event streaming destinations"
-product_section: "dev"
-product_stage: "manage"
-product_group: "compliance"
+product_section: sec
+product_stage: govern
+product_group: compliance
 value_type: number
 status: active
 milestone: "14.6"