Add latest changes from gitlab-org/gitlab@15-11-stable-eev15.11.0-rc42

1991 files changed, 533 insertions, 1985 deletions

diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index 56ea95bdb69..c2f9ecad3a5 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -5,7 +5,6 @@ description: Total deployments count for recent 28 days
 product_section: ops
 product_stage: release
 product_group: ops_release
-product_category:
 value_type: number
 status: active
 milestone: "13.2"
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index df64125b058..b6381d8342b 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
@@ -43,6 +42,7 @@ options:
   - g_analytics_ci_cd_lead_time
   - g_analytics_ci_cd_time_to_restore_service
   - g_analytics_ci_cd_change_failure_rate
+  - g_metrics_comparison_page
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index f053d0870ac..3f729590e1b 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index c92230af6b8..1845052c271 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by mon
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index 553161c1470..c00d500f4d5 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -5,7 +5,6 @@ description: "Unique visitors to /-/instance_statistics/cohorts"
 product_section: fulfillment
 product_stage: fulfillment
 product_group: utilization
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 2de313948aa..8171a552c67 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/dev_ops_reports by month
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index af4493b676b..f2716c0632c 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description:
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index 798c16fd68f..ce0bb54ab7f 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 1f8175bd480..53c10d5f253 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: The number of unique users who visited any analytics feature by mon
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index a66896951f7..c71c83d7064 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count distinct authors of merge requests
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 milestone_removed: '14.10'
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 5db58dd93ae..f908bab1fc2 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of the number of projects with setting to disable overriding
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 32a68c1de56..8577300a357 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of the number of projects without setting to disable overridi
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 3029047f4ad..6f55fa74cfc 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -5,9 +5,8 @@ description: Distinct count of users performing merge request actions like close
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
-status: active
+status: removed
 time_frame: 28d
 data_source: redis_hll
 distribution:
@@ -19,3 +18,5 @@ tier:
 - ultimate
 performance_indicator_type: []
 milestone: "<13.9"
+milestone_removed: "15.10"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115037
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 7f4e0569e25..d7e649ad7f8 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -6,7 +6,6 @@ description: Count of unique users per month who create suggestions in merge req
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 5a6150b21af..7ee99925c98 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who perform an action on a merge request
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index 1329aff088d..a1abd09c9a2 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 8d88ab365bd..5b7b8ae9ef2 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per month with diffs viewed
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index 263a59891b4..ed073e9d152 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index 8370eb21f36..46599f6913c 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per month with diffs viewed file by
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index d4411c5e153..fbcacf73dfc 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who created a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index c8f2386e908..171b4fcd522 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who closed a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 2f3c61f4f3c..4ce189e56d3 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who reopened a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index de20c8fdc7a..a786737461f 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who merged a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 761683fe34f..8da0bf334ca 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who commented on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 16351810c6f..9f035b35c0f 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who edited a comment on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index c15d962b0de..877d2caf905 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who removed a comment on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index d28e463dc1b..cc8846920e3 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who added a suggestion
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index 6ed0515fec5..ea288e7213a 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who applied a suggestion
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 71304cdcc77..41383bbed2b 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Cert Manager enabl
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index c772e7ba6cb..24e70eddbe5 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 0a36f99563f..3a846b8016a 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Ingress enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index e01b941912f..75e14e36b4d 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Knative enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 708c1e64326..8ea669437ff 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -7,7 +7,7 @@ description: Number of Kubernetes clusters with clusters management project bein
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index b91eed1c015..39f8bf477c5 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 2c56b369b49..50e38523ade 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of distict user ids from GitLab Managed clusters currently e
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 3b7c869c851..f9f7e4137c9 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index b48556ca885..855b5f12fac 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index f9e5657144c..7c0560448e7 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters that are user provi
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index 399046a2d6d..1946b6cc1a6 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of users from GitLab Managed disabled clusters attached to t
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 059e26a137b..139ca314e17 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index dbc86047521..284d0ebd945 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids GitLab Managed disabled clusters attached to gro
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index e1ff7306af0..8898c54989e 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Count disctinct user ids from GitLab Managed enabled clusters attac
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index edf02be00dd..b0b2c0e76a5 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters attached t
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 2b601bf2760..9000f412607 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 31c41332fed..3d2777aebea 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering jobs in a month
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index 506abce6ce5..7a66d3dc1c9 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in external repositories in a m
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 7ae086fbdcb..d91b965765d 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in internal repositories in a m
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 6bda7c714d7..06f94fe09b2 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Distinct users that ran an auto DevOps pipeline without a .gitlab-c
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 5253731dcc8..341cc40bba4 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Monthly count of unique users creating pipelines from CI files in t
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index ac55cb82f8f..ed88363f2e4 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline schedules in a month
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index da338611257..4cbd7791013 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in a month
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index a7c21eba666..81419262a36 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline triggers in a month
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 3b036d022c7..99893caa053 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -5,7 +5,6 @@ description: Monthly count of personal Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 8dc9caee45b..a91e66d97ad 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -5,7 +5,6 @@ description: Monthly count of project Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 616368ec513..3f8acf0857f 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -5,7 +5,6 @@ description: Monthly count of All Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index 21c1196f241..0b3cc1b3915 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -6,7 +6,6 @@ description: Count of distinct author_id from snippets for last 28 days
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index 9d56815712f..e5757e6c0d0 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -5,7 +5,6 @@ description: Number of users editing using web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111351
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 592b02c84bc..0716b6f397f 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -5,7 +5,6 @@ description: Number of users using single file editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 012f9db8c80..8167e44c015 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -5,7 +5,6 @@ description: Number of users using the snippet editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index 79f1db5e730..9b263d39521 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -5,7 +5,6 @@ description: Number of users using the static site editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 49da20e316e..33bb1b12c50 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -5,7 +5,6 @@ description: Number of unique users per month who edited a file from any web edi
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index afd69a800cc..bd147983063 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users editing a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 1eda8cb2467..fa5b71b3ca3 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users editing a file from the single file editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 5e3ee643e07..f1faa6a45b8 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -5,7 +5,6 @@ description: Count of monthly edits to a snippet
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 1745055d11e..163821c571b 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who edited a file from the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 0d4a62696b7..3e92ec05e21 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by mo
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index a62b15af694..854c4407ce5 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -8,7 +8,6 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 28d
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 3b61fb65911..f846944a18f 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
@@ -5,7 +5,6 @@ description: Count of unique users per month to take an action on an alert
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 b5afcfa7ae6..4a020dd0742 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
@@ -5,7 +5,6 @@ description: Count of unique users per month to take an action on an incident
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 405a43b3766..6cfec1068bf 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident created in the last month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 e0aa35fea62..ee7f226f63b 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -6,7 +6,6 @@ description: Count of unique projects with an incident from an alert created in
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 e1c9d40715c..bb3aba1ea1c 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
@@ -5,7 +5,6 @@ description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 c3bacf2d529..fbb2c10e7ce 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
@@ -5,7 +5,6 @@ description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 8d8239e5403..4e2f0996301 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
@@ -5,7 +5,6 @@ description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 3f6af2826c5..c2c0d3dad8a 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
@@ -5,7 +5,6 @@ description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 7684c4714d4..e476a14f13a 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
@@ -5,7 +5,6 @@ description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 b769652890b..7d64e5b3207 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
@@ -5,7 +5,6 @@ description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 ac4aedc8be6..2f1fc2fe103 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
@@ -5,7 +5,6 @@ description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 3cdfe2a3bf3..876d41f774c 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
@@ -5,7 +5,6 @@ description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 cb6dd8ce5c2..dda9bc78e8d 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
@@ -5,7 +5,6 @@ description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 a4ecf832a9e..35b30aa260c 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
@@ -5,7 +5,6 @@ description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 b060d0c8c2a..99a2d5fc88a 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
@@ -6,7 +6,6 @@ description: Count of unique users adding issues per month that are related to a
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 af2b7b26610..3859db8db40 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
@@ -5,7 +5,6 @@ description: Count of users removing issues that are related to an incident per
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 92e2413f93a..d32b4e85d1b 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
@@ -5,7 +5,6 @@ description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 68335a034a1..5ee19950f49 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
@@ -5,7 +5,6 @@ description: Count of unique users performing events related with incidents per
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 e8791ee4ea6..ad0cbac593e 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
@@ -6,7 +6,6 @@ description: Count of unique users per month to create an incident corresponding
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index 6c2f8f75861..dd3fa6565a9 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index ca47e918461..63d43242477 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -5,7 +5,6 @@ description: Monthly active users for design management
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 2a9353caf6a..a7125a7f648 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -5,9 +5,10 @@ description: Unique monthly active users of the Wiki
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: wiki
 value_type: number
-status: active
+status: removed
+milestone_removed: "15.10"
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114997"
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 3d3d9015e57..e30babe377d 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -5,7 +5,6 @@ description: Number of distinct users who have generated a manage event by month
 product_section: dev
 product_stage: manage
 product_group: manage
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 806b78be7b6..f0d1bdc5382 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -5,7 +5,6 @@ description: Number of users who are group members for last 28 days
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: subgroups
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index b4646b3e012..a99129a6a10 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -5,7 +5,6 @@ description: Number of users created in the month
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: users
 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 bfbad28ff80..9faf6cf6a84 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -5,7 +5,6 @@ description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 f5100e8a67e..33b35d0ad1c 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -5,7 +5,6 @@ description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 ce391200627..69939472df6 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 47321b7b6c9..56cb1df8724 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 d0e433af157..ed10a481988 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: tracing
 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 0f6696d1666..76ff3d7a834 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
@@ -5,7 +5,6 @@ description: Count of users creating projects with error tracking enabled.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 037da98e5fa..a4770212223 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
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 39af30e7b21..f22005838be 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -5,7 +5,6 @@ description: A monthly count of packages published to the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index ff4a0887c01..a1e10881251 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: The total number of projects in a given month with at least one pac
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 13b38a681b1..ffb7a16e611 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -5,7 +5,6 @@ description: Count of users creating Issues in last 28 days.
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 3bb61debcc0..553c49bfcf7 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -5,7 +5,6 @@ description: Count of MAU commenting on an issuable
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 4d9de3799ad..fbd2f683914 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating projects
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: projects
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 9cffb8c2b35..cff427c9476 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating todos
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index a2a3d0e297f..85372300fdb 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -5,7 +5,6 @@ description: Count creator ids from projects with service desk enabled
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 8ca0b6a55c3..ae780f35bb2 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -5,7 +5,6 @@ description: Count of service desk issues
 product_section: dev
 product_stage: plan
 product_group: plan
-product_category:
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 6f687b89560..c0cbc111c6a 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Distinct count of creator_id from projects with an active Jira inte
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index ba6994ac23a..fdbcab9749d 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Clou
 product_section: dev
 product_stage: manage
 product_group: integration
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 3d327b17de0..0efd1ec9f52 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Serv
 product_section: dev
 product_stage: manage
 product_group: integration
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 0c913b31f6d..d3f6b0805f5 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -5,7 +5,6 @@ description: Count distinct author ids from epics
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: epics
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index a35840cf395..c1d13515d21 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating label lists on Boards
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: boards
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index b61909074df..ae28eb8e057 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing an issue title
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 7aa9aec3e83..e00b7c18176 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing an issue description
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index a7ac8e5ff84..a548cf8ede7 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing issue assignees
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 10ce645e3c1..0ff91cc6f9e 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU making an issue confidential
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 5264a1b5d7f..764acfd1720 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU making an issue not confidential
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 9d8424e05f8..0389fe6a513 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating new issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 4c8177c17b3..962c8d85417 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU closing an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 4c09b7ee20c..6e1690afaba 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU re-opening a closed issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 3d50e6cd9b7..cbf3795eb4e 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue's label
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index af66e66109a..a653df04b24 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue's milestone
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index b1c9d8b9fde..c476a738721 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU referencing an issue from somewhere else
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 4b12bba4a5d..d7d432060d3 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU moving an issue to another project
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 0bd107cdaed..62d58bb6da1 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU relating an issue to another issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index fe0942b44b5..39b482d859b 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU unrelating an issue to another issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 882eb5d1ac2..8d6bb063089 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU marking an issue as a duplicate
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index b8eb3dcf218..290aa31ee18 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU locking an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 7260222961c..0f990ee8dcd 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU unlocking an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 6022e93b0a5..d7958ab29fe 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU adding a design to an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 95543c6093d..953dbd9f7f0 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU modifying a design on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index 85341debfb7..565f819fedb 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU removing a design from an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 60c293fd04d..cfdecbf45e2 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue due date
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index db15f121047..0e4892865e1 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue time estimate
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 50dcf6156b1..c49dc9a076c 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU recording time spent on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 38532866753..3062544003d 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU commenting on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 944b706bdc5..cdf12de3a38 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing a comment on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 201d9d5f169..4327a7e60d7 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU deleting a comment from an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 6aa874e0703..de4fc157b43 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU cloning an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index bd654f16cd5..a9bc74e96e6 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Aggregate count of MAU taking an action related to an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index 3d6bb37de79..a27d6351c94 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/approve` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index c905cdcfb04..04836723d40 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign @user1` quick action to assign a si
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 3c2cad5831e..9a48aebf77f 100644
--- a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/assign @user1 @user2` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 89d0de2550f..7ed3a66af89 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign me` quick action to assign self to
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index ef2778050b0..49e5f98fefb 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign_reviewer` or `request_reviewer` qui
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index ac3ca60d777..0d522959439 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/award` quick action to set an award emoji
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index 4f35a7dcd33..a28aa9018e4 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/board_move` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 235d6505438..90d0389c8b1 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/clone` quick action to clone an issue.
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index d2ae2e53f38..abd86021fb8 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/close` quick action to close an issuable
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 9dca99be928..fa7bac6904b 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/confidential` quick action to set an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 1b8e52b127e..c313f5e5108 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/copy_metadata` quick action on a Merge Req
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 68d3b37035c..3baafede3c4 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index ddcec1d9a86..993489a08c8 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 725e369519d..d4b162a10a7 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/done` quick action to mark a todo as done
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 77a22a982d4..f0a957575b1 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index aea158347d2..a50bd036ddb 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/due` quick action to change the due date o
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index e79a1b5e869..e1a53fb0864 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/duplicate` quick action to mark an issue a
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index e59d264fe1d..3de48247b40 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/estimate` quick action to set a time estim
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 5b34fee13fd..3c80afe9a4a 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 6c1d4bb8520..a0029941580 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 524a75f84d4..f138833b198 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/merge` quick action
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 7e373fe2e13..fb8a1cc1168 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index 88765db809e..f5d1a74e032 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/move` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 44d3d677dee..0b1c9d29c40 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index 061bcbbb6c0..0f931631431 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reassign_reviewer` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index ae3b9ae13c2..938af8fed5e 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
 product_stage: source_code
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 4e3f6f53694..63722b97746 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index 88b3d2c6c6d..763f8e2a7ed 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index ec0f16a09c2..73f14879e36 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 831f9a93982..f58931e1523 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index aacd8916937..1e5453a643d 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 13adfd63500..b70537d3065 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_time_spent` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index 4e0e679e4d8..b183df0c618 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 8341b7f0179..a7c0758618a 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index c711dff2df0..1d608f2fda3 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index 7de55598d47..b431f76fce5 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index 99f7aa98719..e0f66641c21 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 1e3fefbcfae..c63915124e9 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/submit_review` quick action on Merge Reque
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 9eca7c87963..e0f1f69cf29 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index 5280ed2fcbf..a833675082f 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index 15c89bcec88..0bca2bcb539 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 21cb0a54942..b71a8507df7 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/target_branch` quick action on Merge Reque
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 82168bfe6ca..913dbb249dd 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 78a05e1003c..106303b165c 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index df49d1b427c..529f8250bf3 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unassign @user1` quick action on Merge Req
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 426ab3bf763..e2a5bfd1f8e 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unassign` quick action on Merge Requests
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 5cb2e620dc1..e70f32d865f 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` q
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index 00aa10d9578..92ad608b17f 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/unlabel` or `/remove_label` quick action t
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 97e40c5a1b1..0b77381cfb9 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 29c61e97726..f3a113c94e1 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unlock` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index 879a60fc8e7..f04053ccbe6 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unsubscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index fcdc2e28030..3154dd769e5 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index 5c346f40ebc..989754dd94c 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 27881c0975a..eb8b6df44e3 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index 1cd1a8a032a..a6e27b6e8e0 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 5e7ee9b1d50..a375dd5f7c9 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -5,7 +5,6 @@ description: Unique users triggering deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index adf373cde20..8099e8b4029 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Disinct users who initiated a failed deployment.
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index c2530b288b9..d1f7ba91094 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -5,7 +5,6 @@ description: Unique users creating release tags
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index a2282df3e4f..98b65907aa6 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Disinct users who initiated a successful deployment.
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index 9752c924a90..2509db0052d 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -5,7 +5,6 @@ description: Total GitLab Managed clusters with Runner enabled
 product_section: ops
 product_stage: verify
 product_group: runner
-product_category: runner
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 22e30fd46cd..e59714e3587 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating deploy keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index 32debdcde5c..6125702b7f9 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating regular keys in last 28 days.
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 49a8bd129c4..7a44bba7f38 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -6,7 +6,6 @@ description: Count of users creating projects with remote mirrors. Includes both
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index 4744976f4d1..308b55d9a90 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -5,7 +5,6 @@ description: Count of monthly active users who have performed any Git operation
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index 153596352e7..aed69340dfa 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -5,7 +5,6 @@ description: Aggregated value for wiki, design, and project repo Git write actio
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 30a3fdec69a..8f6589b5c37 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -6,7 +6,6 @@ description: Count of users creating projects with repositories making use of at
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index 09aa1254bf7..fc821f8c83f 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 41157cef2fe..db0f7728aa3 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index d6fc28af969..3d873b1c955 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -6,7 +6,6 @@ description: Count of unique actions done on projects and related resources (cre
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 53f1d30f870..0babd0a456c 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -5,7 +5,6 @@ description: Counts of Pipelines that have at least 1 SAST job
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index fee63f8d9fd..580ec1bd31e 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -5,7 +5,6 @@ description: Counts of Pipelines that have at least 1 Secret Detection job
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: secret_detection
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 2bcd22eb7fc..7609b0d3bd7 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -6,7 +6,6 @@ description: Internal Tracking to count number of unit tests parsed for planning
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: code_testing
 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 37c12a1e9be..7557ba58c58 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -5,7 +5,6 @@ description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index d617f3dcebd..9602d8c8553 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index b5c1114ddbb..e5a5db2f0ec 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index ab7e89ce449..e7764661dad 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -5,7 +5,6 @@ description: List of unique OmniAuth providers
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: object
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 4e6bb25cb13..4ea6f65de58 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -5,7 +5,6 @@ description: Number of unique users performing imports
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 2c29feff047..491e71844fd 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -5,7 +5,6 @@ description: REMOVED - Count of projects imported using bulk imports
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index 6deb3c937b2..b84882770ab 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -5,7 +5,6 @@ description: Count of bulk imports - GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 0b776822fcc..c10a3571086 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 73b7ae42466..5d21bc1c525 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitLab using Project Export/Import
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 159f0440bb8..9bb40312f62 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 3ad9a26367e..7267b96f003 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 87c88931a7c..324b918a726 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index f23380e1726..0757b6228cd 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index e886cf6132b..77378e98233 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 316755c772f..fac22f07503 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Manifest file
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 413ccf6d2c0..ed3e8d8d6c0 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index dc7c6c925f2..5ea1a771531 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -5,7 +5,6 @@ description: Count of imports from Jira
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index 44acc1f7fdb..9b66555c478 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of imports from Fogbugz
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 69ea2a20a69..df8c79d12e3 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -5,7 +5,6 @@ description: Count of imports from Phabricator
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 5fd80dfd9a3..b1754f37f71 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -5,7 +5,6 @@ description: Count of (issue) imports from CSV file
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 03ad489c40c..b1a35e1e6be 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -5,7 +5,6 @@ description: Number of group import states
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 8e44c933e6e..293c5502077 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 0c97b73c81a..c9b916cf2bd 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -5,7 +5,6 @@ description: Count of all imported projects
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index 9257e00455c..3b9642da6ac 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 0b9b9163ef1..0ac957a8b4b 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index b25a9b9266f..ad199ad3e30 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 7ae5c83bc6c..04de804a4ac 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index dee0bcf6600..96aa85bd03d 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index cdb61b51634..ef967c52699 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 91e6a29d6fe..779485a9e3c 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 470aee68e76..822ea1f9bfa 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git using file Manifest
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 04d2f7f19ad..2d54f765858 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Jira
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index a11a386f014..83c8e3771c0 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Fogbugz
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 4237650388a..8108a98f4fd 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Phabricator
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index 4bceff8d3f6..a309a3d1f2d 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from CSV file
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 643b5010c09..79e39cb214e 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -5,7 +5,6 @@ description: Count of imported groups
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index bd3b35ae0e9..9ecfd9625d6 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -8,7 +8,6 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index 4225932b14b..15b1ac828f7 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -5,7 +5,6 @@ description: Number of user editing files using the Static Site Editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index d3dcfa28f58..fe89ff7ee4e 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique Git write actions
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 9c8ce1a1f06..c7667b902f2 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -13,14 +13,10 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_testing_test_case_parsed
-  - i_testing_metrics_report_widget_total
   - i_testing_group_code_coverage_visit_total
   - i_testing_full_code_quality_report_total
-  - i_testing_web_performance_widget_total
   - i_testing_group_code_coverage_project_click_total
-  - i_testing_load_performance_widget_total
   - i_testing_metrics_report_artifact_uploaders
-  - i_testing_summary_widget_total
   - users_expanding_testing_code_quality_report
   - users_expanding_testing_accessibility_report
 distribution:
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index ffa7e442f40..abd475b4ba5 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly number of users viewing snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 382c98ccbe2..7d222acb68f 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index bbdead7be2e..d01b08ea827 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -6,7 +6,6 @@ description: Monthly unique user count doing commits which contains the CI confi
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index f3b794bcc95..850a1b3113c 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_st
 description: Count of unique users per month who toggled a task item in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 7968c4cbba5..10075e0b60a 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
 description: Count of unique users per month who approve a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 60a38d6fa8e..3d377fb013b 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
 description: Count of unique users per month who unapprove a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index e58f002071a..61bb424a1fc 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_month
 description: Count of unique users per month who resolve a thread in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index d19a8a9d711..4b518261894 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_mon
 description: Count of unique users per month who unresolve a thread in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 526a0da2dd8..bdbef148d43 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
 description: Count of unique users per month who edit the title of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index 1df6ec58528..eafa238227e 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
 description: Count of unique users per month who edit the description of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 144b0c4cd6a..c94e2898539 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who create a note as part of a merg
   request review
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 33e9f1a2e66..e644c4a3423 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who publish their review as part of
   merge request review
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 0d487ff783e..7a2945e1782 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who create a multiline comment in a
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index b430d20b4c5..5ae14b9b9fd 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edit a multiline comment in a me
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index eaf0244a307..1c4010820b3 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who remove a multiline comment in a
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index b53f211203c..763afebb517 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
 description: Count of unique users per month who are assigned to a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index df3b27dae2e..c9a64b8fde8 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_mont
 description: Count of unique users per month who mark a merge request as a draft
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index 8257411194d..339066b471b 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_mo
 description: Count of unique users per month who unmark a merge request as a draft
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index e3c41d33dfc..0a01e27c5c1 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_mon
 description: Count of unique users per month who request a review of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index 475623aaa65..e183ef2c90e 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_
 description: Count of unique users per month who add an approval rule to a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 23795ffbead..74bd2954a1d 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who delete an approval rule to a me
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index aa60572f00a..cbd08be25b4 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who delete an approval rule to a me
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index 3a94b3062e0..7003ddc400e 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_
 description: Count of unique users per month who use GitLab Workflow for VS Code
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index a4133bbef1f..38776d15467 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue
 description: Count of unique users per month who create a merge request from an issue
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index ac6500672c2..9f1c46764f3 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
 description: Count of unique users per month who interact with a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index c219ea4dbfd..19d4de90bdb 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto DevOps runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 0143fa01995..0f713615c12 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index ee1c9ff1694..db546cbb42f 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index a26887fef7d..3fa025e908b 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 9e97dbe0bf2..1d01849bbd2 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Secret Detection runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: secret_detection
 value_type: number
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 6fd6f8eb080..c546fba8629 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -5,7 +5,6 @@ description: Number of projects using 5 min production app CI template in last 7
 product_section: seg
 product_stage: deploy
 product_group: 5-min-app
-product_category: five_minute_production_app
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index ac40f896b35..723776de6f8 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the Auto DevOps template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 6da5d7822d2..12c46bcc065 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index 0ad5b9a9a5c..a787e944c81 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index a5e5b1239d4..05b81b18592 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the Auto Build template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index affc895a9ed..ccf0acd5af5 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index d1f300d4ab5..0e49b4668cc 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 2d8d1f10866..080c18ae42b 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with SAST runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index b8114ecb647..89e27aba436 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with Secret Detection runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: secret_detection
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 9774fc3a35e..1eb8b515254 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines that include the terraform base template from Gi
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index ff4231231aa..cb112a9e078 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Total count of pipelines runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.3'
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index fdd30477ed3..08e948b459e 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using one or more quick actions
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 1f68d5e5af8..18b26b32663 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Composer packages published to the registry usin
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index 7f412de4467..9e06c9f114c 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Conan packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index d664a9fec80..3b7c46665cb 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of container images published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index 20dbc97c7e8..745c2ee2e5b 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Debian packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index fb60d6165ba..99427e2e576 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of generic packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index e4c289fc23f..06d5ba1a1c9 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Go modules published to the registry using a dep
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index 5451a18cc82..1be7167e913 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Maven packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index 123df5707f8..f60511900e0 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of npm packages published to the registry using a d
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index b9f87e33fa9..3140804a1c2 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of NuGet packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index 05e80915b60..d770f2b005d 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of PyPI packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index a1409e87db2..cc15da4ab35 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of package tags published to the registry using a d
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 59427c74b0f..203a6a2a672 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of unique users who published packages to the regis
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index f0fc010c722..9fcaf84fa69 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a Composer package to
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index 7388ed8860b..645fa3e1845 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Conan package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index 5c7f1b30f44..e415623ff53 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a container image to t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index f6a96c326c9..6b805cedbe4 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a Debian package to th
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index cce0c3d6a65..34576e8a5a1 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a generic package to t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index b6df3cb30f2..3c7e09e69fd 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Go moduleto the regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index d591e6ec5da..c68523cc4a9 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Maven package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index e9992148893..531a8c7c481 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published an npm package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 0a77f2de550..885b99185ac 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a NuGet package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index 6cc9645516a..9fab8ef2e0a 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a PyPI package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 9fc86ae712c..f7a7af76999 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a package tag to the r
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 5223f5c746e..8e6c286aa32 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a package to the regis
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index d1b7a63db8e..5a4a030ec8b 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users closing Jira issues by month
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index cea761bd778..7b29944abcb 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users that cross-referenced Jira issues by month
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 93be16fa2f4..1f84f98c8a0 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users for Jira and Slack by month
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index ae717f7cc1e..4339600f952 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a single e
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: issue_tracking
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index ce22e3ad675..e26f47b3fee 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a multiple
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: issue_tracking
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index c8d329a777b..b9cde9eb3fc 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed time estimate of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index aee5fb45c10..7bf47d2123b 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed time spent on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index 9cc58cc7963..a9b237dbdf9 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who locked a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index 9474d1c8253..e67a57aa18a 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who unlocked a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index 25f6292cae0..f0efe925e5e 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique user count having merge requests which contains the
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index 2e23791ef95..2a846c2394b 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed milestone of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index d93dd8e64a8..79d847ff7e7 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed labels of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index e42d744b718..93a02122904 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed assignees of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index 9bbee5ed9b6..fea49890def 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed reviewers of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 01e2b9d0059..0e57e05f2a5 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index d028a10c1a3..ae96872256b 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index 2b8f4166e6b..84016afca21 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 7b5515f99a5..954e35e7085 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index 7229d9b0803..1402709d252 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index bd2269d1680..d663cb5abde 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a no
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index 73fa05ac498..55ce46cd3be 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index 5cb154ad6e4..9d7b5c34ae7 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a co
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index bcd3147e9ea..fc809736fcf 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 6ca11514b09..9c30f6b619e 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct count events for RubyGems packages published using a Deplo
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index 2d5eda05a7f..88bfd28577a 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct user count of RubyGems packages published in recent 28 day
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index dfaff8de054..c7f0363f558 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the security report widget
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index 498569c95aa..a27a860039d 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the code quality widget
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: code_quality
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index d800cd2f3e9..0096809d89e 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the accessibility report widget
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: accessibility_testing
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
index 64daea732c5..94a6f18b331 100644
--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users authorized via deploy token creating Terra
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
index 070a0669d54..b8ad472f171 100644
--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users creating Terraform Module packages in rece
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index ed25f2c18a8..76572f03b8f 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -5,11 +5,12 @@ description: Unique users that expand the test summary merge request widget by m
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
-status: active
+status: removed
 milestone: "13.11"
+milestone_removed: "15.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114018
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
index 5557480f8fb..2ea622f3cdc 100644
--- a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking single file mode setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
index e8e988a4523..b8897c1ebd1 100644
--- a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request file browser setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
index 483923397b5..0f22954faaa 100644
--- a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request whitespae setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
index bc628468e30..3b6ec8b69e4 100644
--- a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as inline
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
index f1c431574f9..82de9d8ed4d 100644
--- a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as parallel
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
index 75f0169692a..b4007b2da78 100644
--- a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file tree setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
index ccd333ba13a..13bd280e7b9 100644
--- a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
index 23dae4618b1..b87901678ef 100644
--- a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace enabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
index 4a639d02565..b883ce9e41c 100644
--- a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace disabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
index 8ae647ab1de..f5149c088e9 100644
--- a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with single file mode enabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
index f4aa1da6498..c51107d4177 100644
--- a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with single mode disabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index 802fc03bee4..51a688a5806 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Unique users performing actions on code review events
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 379307a2f44..f5ab886d5cf 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing i_code_review_user_vs_code_api_request e
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 7ef2725f01c..16e077875d4 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing at least one of the code review events
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index 698928834ed..be9f6bdb94c 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users doing commits or push MRs which contains CI cifig file
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index f08a7bfd4d6..6cee7067b48 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -5,7 +5,6 @@ name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index b8dc238e59f..b25a9344eda 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -5,7 +5,6 @@ name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 9a6bf373cbe..2c17a6ec8f6 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -5,7 +5,6 @@ description: 'Count number of projects created monthly'
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: ''
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
index c0fd95f4be2..e6e7e2fbc1f 100644
--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct Helm pakages deployed in recent 28 days
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
index 0e32bf86f68..c71312d7cc4 100644
--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct user count events for Helm packages in recent 28 days
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
index 1a7437259f6..96136b2396b 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -5,7 +5,6 @@ description: Total count of projects imported
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
index 28425f5f1cd..254734374e3 100644
--- a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking diff view setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
index 0efb03c9fe9..6d95f6b1be2 100644
--- a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
+++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
@@ -5,7 +5,6 @@ performance_indicator_type: []
 product_section: ops
 product_stage: release
 product_group: 'release'
-product_category: Release Orchestration
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
index 106ab05f6d5..c16a1885e4f 100644
--- a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
+++ b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who search merge request diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.2'
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 eedece821d0..b5a83d81c0a 100644
--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/severity` quick action
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
index 19bd4f54e5c..31609397e5e 100644
--- a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
+++ b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
@@ -5,7 +5,6 @@ description: Total number of monthly suggestions
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
index 97550aee80e..9ad967fd5f6 100644
--- a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
+++ b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
@@ -5,7 +5,6 @@ description: Total number of monthly suggestions applied
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
index c0c5de03d6f..44669cb8c83 100644
--- a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
+++ b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
index 5a9cff02906..9879f3123bf 100644
--- a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
+++ b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
index 41f112b57f1..b6d59480bab 100644
--- a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
+++ b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
index d95c9cbc109..53b88e04d27 100644
--- a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
+++ b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
index 98a953405aa..b459ce7f4ec 100644
--- a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
+++ b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
index 3f920a72e15..bad3c51bad6 100644
--- a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
+++ b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
index 555a6f890bb..4e198b52ced 100644
--- a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
+++ b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
index b5f6a658333..5a87530bee3 100644
--- a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
+++ b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
index 18ebe62b906..d5f06ef5388 100644
--- a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
+++ b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
index 09d24d2e7ba..0f0906a50d7 100644
--- a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
+++ b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
index 69d3c644a26..322b1251f7a 100644
--- a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
index e0613d891d0..e17ceeb00db 100644
--- a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
index 251818174b5..71dbfa2bc99 100644
--- a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
+++ b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
index 5af12fc9ae1..2419653655b 100644
--- a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
index 9baa924ab54..1404da33a1b 100644
--- a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
+++ b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
index d50535100b2..6ad88c0a492 100644
--- a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
index fa17dac5c95..95ba6abe48a 100644
--- a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
+++ b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
index ee5778aa20a..f5a92907ea6 100644
--- a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
index 25a8772f26c..a4602018c7b 100644
--- a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
index 52050daf8a5..0992cbe18b0 100644
--- a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
index e04854b1ea2..6d643bf17e4 100644
--- a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
index 511602c7c28..95c4a9ce621 100644
--- a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
index ae18f69469d..36e672b0295 100644
--- a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
index 84fae41c611..c72a28f0188 100644
--- a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
index 37440c240ec..0cfd3fb765d 100644
--- a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
index ff73e16a84b..807dcdea3aa 100644
--- a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
index 5015909a1be..3c16107b3f4 100644
--- a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
index e21e7cbcaae..3a465bf837f 100644
--- a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
index 6b5b028aa2d..97bf666f528 100644
--- a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
index 4e1407fd8e3..fa5e04aceb1 100644
--- a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
index 7fa3decd102..bb0d3b2b82f 100644
--- a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
index 6f18d8f2be4..1f2eb751ccf 100644
--- a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
index a9646741a9e..ee49df0ab24 100644
--- a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
+++ b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
index 435cbb1f4ff..707c8db8202 100644
--- a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
+++ b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
index 356114d1182..5005ee2ed91 100644
--- a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
index 6f6f921d20b..3efa2b49546 100644
--- a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
+++ b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
index 883a844b26f..63a3dfef669 100644
--- a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
+++ b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
index 4ecf88abb14..ebbb87ead2b 100644
--- a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
+++ b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
index 7e4a493864c..473002dd3a6 100644
--- a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
index 5b813f20ad9..ea4c9630a3d 100644
--- a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
index 27ff46f6a35..37f59ffb929 100644
--- a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
+++ b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
index 6f98773d30a..1cafb328f1a 100644
--- a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
+++ b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
index d32a8f007b9..135e839e49c 100644
--- a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
+++ b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
index af9f85bf1e4..4b3147a9c99 100644
--- a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
index 743a1ec2013..3eb212b357e 100644
--- a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
+++ b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
index d4e4b37c93c..bd7fe7d8385 100644
--- a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
+++ b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
index c30375c57d4..8dbd1225aeb 100644
--- a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
+++ b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
index 25dce4f9013..7519e296bcb 100644
--- a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
+++ b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
index 2faeb424f2d..bf00ce648f6 100644
--- a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
+++ b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
index c7d1ea576fc..89b82f0a5ba 100644
--- a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
+++ b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
index 2523dec8efd..894316bdf03 100644
--- a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
+++ b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
index 6841d54790a..9dabc5324f6 100644
--- a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
+++ b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
index 9b2ec95d2c5..639496b9dc3 100644
--- a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
index d195c569a75..15bb141e3d4 100644
--- a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
index c66530b37b7..34890a93278 100644
--- a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
+++ b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
index f9217f10ac6..2b5eb9be232 100644
--- a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
+++ b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
index 7efd539e992..63f25134d5a 100644
--- a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
index 851855e76b0..21193bc9205 100644
--- a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
index 057ce9ab19a..fc599157bf3 100644
--- a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
index 81b8196f348..ace0b49561f 100644
--- a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
index 09de2ec628a..a9d0ebecc80 100644
--- a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
index 98c1d5c752f..a2bb6add9a2 100644
--- a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
index 2780fb76618..958d436bdc9 100644
--- a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
index 0595e6a6c2f..00225d132f0 100644
--- a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
index 701d6711c6b..ab750a54111 100644
--- a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
index 2c4f32e95dd..58cd656f7a2 100644
--- a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
index 2c582ae2d5d..0287d2c9bd8 100644
--- a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
index f3907820de0..c2926eef7b6 100644
--- a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
index d6b9a891d9c..ef09d4d97cf 100644
--- a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
index 6a05970b675..375fbb76d52 100644
--- a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
index a1c568a7ff9..c99a6789349 100644
--- a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
index 02fb579e03b..17e92e81059 100644
--- a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
index 856cb3d7431..80e9e5436c6 100644
--- a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
index 920efea27ad..1208176e89b 100644
--- a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
index d09907dc91b..0e3a161dacb 100644
--- a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
+++ b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
index 9271873d5a5..305b1ea780f 100644
--- a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
+++ b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
index 1a1666d961e..5d2fe0ffdbb 100644
--- a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
+++ b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
index e393a28d402..25c34113482 100644
--- a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
+++ b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
index 3e15963a0e4..a3e5991c41a 100644
--- a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
+++ b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
index 3a847e76a4d..6c4efe579ec 100644
--- a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
+++ b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
index 18cd9350c18..c075b69a5c8 100644
--- a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
+++ b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
index 8359a8b94a4..97dbb45f821 100644
--- a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
+++ b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
index 8290dc0e832..a6834f97783 100644
--- a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
+++ b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
index 45768b15c10..4d43cac3a36 100644
--- a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
index c7615209431..116b7bf4730 100644
--- a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
+++ b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
index 951a61d56ae..fca3e8bd88e 100644
--- a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
index fe749f92436..d4a1a2e8182 100644
--- a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
+++ b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
index 37b49978853..f1df4d2242b 100644
--- a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
+++ b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
index da09183e928..f735c07b065 100644
--- a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
+++ b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
index 5fadb6ce074..0585c926f12 100644
--- a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
+++ b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
index 1f46fd06db7..1c01e508846 100644
--- a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
+++ b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
index 1132a4b95c2..7f3cb047a72 100644
--- a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
index 33ee3737f95..4f50ca1176d 100644
--- a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
+++ b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
index eb93f5910ed..69dd65a91e5 100644
--- a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
+++ b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
index 390d155415e..8cc5d9861cf 100644
--- a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
+++ b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
index 199718e6b1b..f860cc65e1c 100644
--- a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
+++ b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
index 47aa49e8fb4..48d833b8b36 100644
--- a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
+++ b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
index 5aadbcdd402..2be20e8915c 100644
--- a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
+++ b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
index 43851ae9fb3..e3c904eb379 100644
--- a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
index ce9d5065fc1..b90e11ecd33 100644
--- a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
index b52850bdca9..cab301492df 100644
--- a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
index 539781592bd..373fc6e596f 100644
--- a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
index 11c66d9dd11..fdfef5a8ef9 100644
--- a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
index e30f559b879..bd2c8096fa4 100644
--- a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
index 7c56b16701b..3a29a9ccae3 100644
--- a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
index e52602a96c8..fd12f7e50be 100644
--- a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
index 05bcdade966..e6737e04c3f 100644
--- a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
index 4bc50406910..38c90a0b935 100644
--- a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
index 6c71d424338..2a3059806be 100644
--- a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
index 9c8f24f35b6..5f83aedbc50 100644
--- a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
index 4424cf72a53..2c7f1709af1 100644
--- a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
index d5dd0372093..75c180c2cc2 100644
--- a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
index f8f018a6a28..561a268a0e1 100644
--- a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
index 81a1a37e050..9f11e619fbb 100644
--- a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
index 49f7d1e9cf1..d7681de83f8 100644
--- a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
index b3deccc2520..f6f7dbaa1b6 100644
--- a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
index 0a22cf9e860..9979e069c17 100644
--- a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
index ba4ec3b4fa3..ef58916d90c 100644
--- a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
index 176964c3cdc..c83b452c8eb 100644
--- a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
index 0c8001e6f77..0761177631b 100644
--- a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
index 9c22a733f84..707fda6a628 100644
--- a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
index c1281685678..d41df75db4c 100644
--- a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
index de98bdd43b7..c1c7c7e5d1b 100644
--- a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
index 6e9ccb48983..0e222a4bd39 100644
--- a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
index d0e9b20316b..1ee2bc2d08e 100644
--- a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
index 7b7ce070486..89c4c6d7f57 100644
--- a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
index 25c535315d2..88960e3587c 100644
--- a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
index 3450683aaf3..66f66f4ef6a 100644
--- a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
index 8611f03604e..ff9c86828ed 100644
--- a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
+++ b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unapprove` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
index f44d7a6c045..4a7ee8d1292 100644
--- a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
index 5c2327fd50b..370c12cdc43 100644
--- a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
@@ -5,7 +5,6 @@ description: The number of users who resolve a thread in a new issue through the
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 7aad160f01d..14914a140d4 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -5,7 +5,6 @@ description: Number of unique user logins using two factor authentication for av
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
index 5c1ad6446f0..444fa936b3d 100644
--- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml
+++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
@@ -5,7 +5,6 @@ description: Count of issues promoted to epics
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: removed
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
index 1d3b7907c13..2b46ab92910 100644
--- a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus integration enabled in last
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
index a923fd255b7..487796a4e08 100644
--- a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
index 73141ddf341..3ab54fc3262 100644
--- a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.4'
diff --git a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
index 13f3bb050db..d61059ac43f 100644
--- a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
index baa0b529d26..1ef3b19a9bf 100644
--- a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
+++ b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were enqueued to start monthy
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
index ca943ecad7f..4f1e01e0f2c 100644
--- a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
+++ b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were successful monthly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
index fe97d6c0eeb..fd36259e74d 100644
--- a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
+++ b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that failed monthly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
index eb03acc2476..fb9f7b97bdc 100644
--- a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
+++ b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 milestone: '14.3'
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 e50780d378f..51e3dbcc9eb 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
@@ -4,7 +4,6 @@ description: Count of MAU using the `/promote_to_incident` quick action
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
index 5f171c62bab..65f1eecc7e6 100644
--- a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
index 781dbbe7b60..68db0a93e47 100644
--- a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
index 90f8eae91fe..33d7a214bf2 100644
--- a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
index c676750d92d..a003d211cb5 100644
--- a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
index d20b78cab9b..fca5481e70a 100644
--- a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
+++ b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the create file button in the nothing to m
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
index f00f7cfafb9..64c8c78f3fb 100644
--- a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/add_contacts` quick action
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
index cdf2b6abf39..aae449dc7ff 100644
--- a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/remove_contacts` quick action
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
index c944a82a373..9310459c466 100644
--- a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
+++ b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the delete source branch button after merg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
index b01a6fe58f5..baca691621f 100644
--- a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
+++ b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the revert button in the merge requet widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
index 40f5cac914c..e6cd861ec27 100644
--- a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
+++ b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the cherry pick button in the merge requet
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
index 592f51e2e99..74f14aacdd8 100644
--- a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
index 15d1bc80bb2..00e5281d224 100644
--- a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
index ec67d0a713f..0cba55aa82e 100644
--- a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for DAST API latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: removed
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index c10bc664168..845500bff73 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 8cf5acd5b0c..d719ac3e5d1 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index 60dcee1d757..d0640d97d37 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
index c353641bd6f..9ae9fde73dd 100644
--- a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the license compliance widget
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
index 1f84c9f1788..ca82066ca10 100644
--- a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the license compliance full report
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
index cfcffe5caca..ee6037ab014 100644
--- a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for DAST API latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "14.6"
diff --git a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
index a8fcd038e84..632379771ab 100644
--- a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
+++ b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the manage license compliance page
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
index cd9132bbcfc..f98ded492df 100644
--- a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
+++ b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking licence to visit external information websi
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.7'
diff --git a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
index e26732ec916..7a9ea8e9467 100644
--- a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
+++ b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.7"
diff --git a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
index 2ca245c3c68..879818d59db 100644
--- a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use GitLab plugin for JetBrains
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 value_type: number
 status: active
 milestone: "14.8"
diff --git a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
index 7be45e79f51..dd534423ae5 100644
--- a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/attention` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
index 2b002bc3790..45053ac7ad9 100644
--- a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/remove_attention` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
index ddc6907ee19..b88adb8bc0b 100644
--- a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts of times users have executed deployment jobs
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 milestone: "14.8"
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
index 8f913307356..82f11d6dcd1 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of Dependency Scanning CI template
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
index 2b776b28c5d..b1663d3fdce 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of License Scanning CI template (Jo
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_compliance
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
index 6d166725a67..c1981ac4780 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Dependency Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
index db215d242e0..e20d4f08c05 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for License Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_compliance
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
index cf711de79a9..084c8364ad4 100644
--- a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_title_monthly
 description: Unique users updating a work item's title
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
index 82130118e43..775ac392583 100644
--- a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_creating_work_items_monthly
 description: Unique users creating work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index 70cc27b801c..a70ee00e254 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.xmau_plan
 description: Unique users interacting with Plan features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 13a943c972c..fa4ca4719cb 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.xmau_project_management
 description: Unique users interacting with Project Management features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index cb3dc63035f..3ba2f8b0f50 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.users_work_items
 description: Unique users interacting with work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: product_planning
diff --git a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
index 214c6504051..eebad4ce41f 100644
--- a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
+++ b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category:
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
index 219147def08..de4160c1d4e 100644
--- a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for SAST CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
index c0d4ba01f03..3e51bb0e4aa 100644
--- a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Secret Detection CI Latest template (Security fol
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
index 3a25e0a5a4b..7f2f96839d4 100644
--- a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
+++ b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the error details page
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
index c94cca65514..5eb32ad63d0 100644
--- a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
+++ b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the list of errors in the project
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
index bd61f9ddc57..26a51a0b7f9 100644
--- a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
+++ b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
index 64f0bc79682..a29bcda2c6c 100644
--- a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit use of Secret Detection CI Latest templa
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: removed
 milestone: '15.0'
diff --git a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
index e77e4044894..bd823775451 100644
--- a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of SAST CI Latest template (Jobs fol
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: removed
 milestone: '15.0'
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
index 646260aa65e..ec083e28bee 100644
--- a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -4,7 +4,6 @@ description: Total unique users accessing error tracking routes
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
index 1496e9dd5e5..e2a58bd67e5 100644
--- a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use the GitLab CLI
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
index 1ee10431b4d..921dbb2a7ed 100644
--- a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
+++ b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220428154012_live_preview.yml b/config/metrics/counts_28d/20220428154012_live_preview.yml
index 23bfd9334bc..aa06bbcaaea 100644
--- a/config/metrics/counts_28d/20220428154012_live_preview.yml
+++ b/config/metrics/counts_28d/20220428154012_live_preview.yml
@@ -5,7 +5,6 @@ description: Count of monthly unique users that successfully connect to Live Pre
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85420
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
index 87ee4ff392b..937c4039c27 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb commit diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
index 8a5a50572d8..8f6435909ab 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
index 907c1459293..3d52754312e 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb MR diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
index e33149db20f..38face8ecd6 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb commit diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
index b6f8e09039e..a04ec7b91b2 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
index 732124e34f0..133601115e0 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb MR diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
index ddde77a1755..60d5c9ac054 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
index 7b817928c59..894da4185b0 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
index a4042763c46..6fdaf8c5b2c 100644
--- a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
@@ -2,7 +2,6 @@
 key_path: counts_monthly.unique_active_users
 name:
 description: Users that have a last_activity_on date within the past 28 days
-product_category:
 product_section: dev
 product_stage: manage
 product_group: manage
diff --git a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
index abbc30a5d10..64913e9645e 100644
--- a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
+++ b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
@@ -4,7 +4,6 @@ description: 'Monthly counts of times users have executed katalon_tests jobs'
 product_section: 'ops'
 product_stage: 'analytics'
 product_group: 'pipeline_authoring'
-product_category: 'pipeline_authoring'
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
index d379cf39983..e007180b831 100644
--- a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Counts unique users for timeline events create, edit and delete eve
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.1"
diff --git a/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
index a9a62b1aa79..4527fcd125a 100644
--- a/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
+++ b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Time to
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml b/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
index 389b9d3ace5..0e144b0c486 100644
--- a/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
+++ b/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_approve_mon
 description: Count of unique users per month who submit a review and approve
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: dev
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml b/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
index 1891191bdcd..cd37fa4c5ec 100644
--- a/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
+++ b/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_comment_mon
 description: Count of unique users per month who submit a review with a comment
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: dev
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
index 7abc7b63c84..78427581b47 100644
--- a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
+++ b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts of times users have executed verify jobs
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
index 88fc09b6cc2..ce8f461d5a2 100644
--- a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
@@ -2,7 +2,6 @@
 key_path: redis_hll_counters.work_items.users_updating_weight_estimate_monthly
 name: users_updating_weight_estimate_monthly
 description: Unique users updating a work item's weight estimate
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
index 186011b35af..b63e7d6f535 100644
--- a/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
+++ b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Change
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml b/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
index 07ba085063a..ede7a8fc89b 100644
--- a/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
+++ b/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Test S
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
index 1b27e018e5e..cb4c04c11aa 100644
--- a/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml b/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
index 40134414c5b..422729f9667 100644
--- a/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml b/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
index a6c08e49a5b..137b2e84600 100644
--- a/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml b/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
index 7636ffae159..1ebee37078b 100644
--- a/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml b/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
index 7b84436ad57..3f90b18daf7 100644
--- a/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
index 27c387dc423..f1d5a3e795c 100644
--- a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Fortify FoD SAST template
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
index 574c9f41128..4a8d58800d3 100644
--- a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the Fortify FoD SAST te
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.3'
diff --git a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
index 8e214153e9d..41a9f40eb63 100644
--- a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
+++ b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_dates_monthly
 description: Unique users updating a work item's date
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml b/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
index aa17e1ccf55..62280cf5379 100644
--- a/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
+++ b/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Access
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
index ad86cccdf72..b69c7fb833d 100644
--- a/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml b/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
index 2e1ca0c8e70..bbc44c48dc5 100644
--- a/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml b/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
index 79505bad72e..c75fb74c534 100644
--- a/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml b/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
index 78009cb34c3..e2ef4df5ee1 100644
--- a/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml b/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
index e4ba9b8f53b..d32607b0b09 100644
--- a/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml b/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
index a73f6a919ea..c807c6c1778 100644
--- a/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
+++ b/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Code Q
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
index 3fbd759deab..1aa25b27a64 100644
--- a/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml b/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
index 3b4686c28cc..b3e3e2f5009 100644
--- a/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml b/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
index e36a74550d4..7c493c4300d 100644
--- a/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml b/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
index 181c06ec06f..58b211aa5d2 100644
--- a/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml b/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
index 5e4e6221142..1856bdcba9a 100644
--- a/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml b/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
index c18e947f722..23ee2e35ef3 100644
--- a/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
+++ b/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Terraf
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
index 1791ba6d4cf..9f80b3b97f6 100644
--- a/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml b/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
index 67f73ee4122..52c18d623dd 100644
--- a/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml b/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
index a374ed99263..a938d95c7c0 100644
--- a/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml b/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
index 909211e2a35..9fff51a7f3b 100644
--- a/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml b/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
index a1d247d405f..2d974d06d43 100644
--- a/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
index 8fc01895a1d..683fd308b0c 100644
--- a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
+++ b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
@@ -4,7 +4,7 @@ description: MAU of the Agent for Kubernetes CI/CD Tunnel
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
index 3b19ef26a6a..88caf147407 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
@@ -5,7 +5,6 @@ description: Count of group entities with failed status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
index 72af0e3e18b..c0cedfc3147 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
@@ -5,7 +5,6 @@ description: Count of group entities with finished status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
index 079fc328d73..4f2107e22ed 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
@@ -5,7 +5,6 @@ description: Count of group entities with timeout status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml b/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
index a9ead88577d..b7772816df1 100644
--- a/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
+++ b/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
@@ -5,7 +5,6 @@ description: Count of project entities with timeout status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml b/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
index 74c45c05641..2c2f80250ff 100644
--- a/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
+++ b/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
@@ -5,7 +5,6 @@ description: Count of project entities with failed status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml b/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
index 228d6851020..557b502acfc 100644
--- a/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
+++ b/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
@@ -5,7 +5,6 @@ description: Count of project entities with finished status in GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
index cd124735153..3ac7f48069a 100644
--- a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
@@ -4,7 +4,6 @@ description: "MAU of junit test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index dbcd665d616..f704340e439 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -4,7 +4,6 @@ description: Number of unique user logins
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml b/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
index 60567037303..f793b02ac94 100644
--- a/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
+++ b/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Licens
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
index 3b4c0012495..cbb4bb98bba 100644
--- a/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml b/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
index 7b0ec9d0518..a6480b5a72f 100644
--- a/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml b/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
index c6b7689c844..cf6faec1463 100644
--- a/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml b/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
index 5e164b5c3bf..3f8f844948d 100644
--- a/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml b/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
index 69af6c70299..75046f9f927 100644
--- a/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
index 3eac5ca1c01..908f5137d7d 100644
--- a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
+++ b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly count of unique users visiting environments pages
 product_section: ops
 product_stage: release
 product_group: release
-product_category: environment_management
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
index 86b11489af0..da2e3095db9 100644
--- a/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
+++ b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users created timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
index 31815426918..171204036f9 100644
--- a/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
+++ b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users edited timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
index dbc3ac61071..729c998f83e 100644
--- a/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users deleted timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
index 943a1ba235c..05683fbce5f 100644
--- a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
+++ b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/ready` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 data_source: redis_hll
 status: active
diff --git a/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml b/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
index f3f9499e9d9..f738e97749a 100644
--- a/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
+++ b/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/timeline` quick action
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
index 47068af05e2..bdcf97602db 100644
--- a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs using the stable SAST Ia
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
index 0bcdad370ce..1f579aade8b 100644
--- a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST jobs using the stable SAST Ia
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
index 9cbfee008c3..ae659173c27 100644
--- a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Dependency Scanning CI Latest template (Jobs fol
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
index fbf263cd6bc..c5728388138 100644
--- a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI Latest template (Security
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
index b78e5bc65fa..21d64a706de 100644
--- a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for License Scanning CI Latest template (Jobs folder
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
index 8e51d7e163a..230870b2fc5 100644
--- a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit Dependency Scanning CI Latest template
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
index 8ad48955bea..5c5afa10f50 100644
--- a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit License Scanning CI Latest template (Jo
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
index 3d5db04c7b8..4b69fe42a39 100644
--- a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit Container Scanning CI Latest template (
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
index c4fad8d7545..fe933e4c677 100644
--- a/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Coverage Fuzzing latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
index a66558a3537..5bd5653b1e3 100644
--- a/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit Coverage Fuzzing latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: removed
 milestone: '15.5'
diff --git a/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
index 4c19e4e3261..8ab0b5b4065 100644
--- a/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
+++ b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's iteration
 product_section: team planning
 product_stage: dev
 product_group: plan
-product_category: project_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
index 52b75a90a03..ab17a29c2e6 100644
--- a/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
+++ b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/link` quick action
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
index 5ebb56ea936..67156594fb7 100644
--- a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
+++ b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_labels_monthly
 description: Unique users updating a work item's labels
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
index 02edb32765e..af4ef68c9ea 100644
--- a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's milestone
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: team_planning
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
index a3d47aa4c49..65d0d439a90 100644
--- a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
@@ -4,7 +4,6 @@ description: "MAU of coverage test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml
new file mode 100644
index 00000000000..6297705dd12
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_confidential_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml
new file mode 100644
index 00000000000..2ff044f203b
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_note_notification_monthly
+description: Calculated unique users to trigger a Slack message by creating a confidential note by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_confidential_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml
new file mode 100644
index 00000000000..a2cad64b205
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_deployment_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a deployment by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_deployment_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml
new file mode 100644
index 00000000000..03f5ff49255
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_issue_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml
new file mode 100644
index 00000000000..371bfd39149
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_merge_request_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_merge_request_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml
new file mode 100644
index 00000000000..984c53a7186
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_note_notification_monthly
+description: Calculated unique users to trigger a Slack message by creating a note by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml
new file mode 100644
index 00000000000..34ccbfd40ab
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_push_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a Git push by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml
new file mode 100644
index 00000000000..457c23660b2
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_tag_push_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a tag push by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_tag_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml
new file mode 100644
index 00000000000..96824de717e
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_wiki_page_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_wiki_page_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
index 62ce68dd4e6..88b514194b9 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of Container Scanning CI template (
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
index df169b9eb48..e86498a3f85 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI Latest template (Jobs fold
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
index 2abbb3f9b16..eabe049ea57 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
index 4e9d58bddad..fe61039878c 100644
--- a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
+++ b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
@@ -4,7 +4,6 @@ description: Number of unique merge request authors
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
index 078da4a2768..40bf6f71a3d 100644
--- a/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
+++ b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Securi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
index 2b520e995d2..3760f8d8f3d 100644
--- a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
+++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
index e18744673e4..d5ca0517079 100644
--- a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
index e604a3df3e6..b93b54535bf 100644
--- a/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
index f33f78961a9..6a86e5f21b6 100644
--- a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
index 28763d81c88..20d69b68312 100644
--- a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
index e081e74b967..252559b3b20 100644
--- a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique merge requests created per month
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index 9c02ed98a82..dc62055774b 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who removed a comment on a design
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
index 97a74e44f65..6cfede35f93 100644
--- a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
+++ b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
@@ -5,7 +5,6 @@ description: Count of monthly active users for pipeline insights features
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml b/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
index a99bcf9fdf4..d3e28450d1a 100644
--- a/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users (monthly) who read runner job statistics
 product_section: ops
 product_stage: verify
 product_group: runner
-product_category: runner_fleet
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml b/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
index ff1677e4857..bf7754b6c80 100644
--- a/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
+++ b/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly count of unique users who created a pipeline with id_tokens
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: secrets_management
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml b/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
index 2c2bcc689a0..09dbf32cbe4 100644
--- a/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have pushed a tag to the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml b/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
index 177fc92f3f0..d78c6c8c4b7 100644
--- a/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have deleted a tag from the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml b/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
index 6aa8a0fc5cb..d252b406d42 100644
--- a/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have pushed a repository to the regis
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml b/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
index 5dc8a351956..7ce612609c8 100644
--- a/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have deleted a repository from the re
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml b/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
index a1789967986..6fc4f742570 100644
--- a/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have created a repository from the re
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
index 2aa6bf583e0..35d4706c1ef 100644
--- a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
+++ b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
index bf83a73330e..9e3d705d454 100644
--- a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
+++ b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module Base template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
index 1fa9772ae67..13fd0f295ec 100644
--- a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
+++ b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for API Discovery CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
index 5d927562f42..acc9ae681f3 100644
--- a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
@@ -4,7 +4,6 @@ description: Total monthly (28D) pipelines in Gitlab repositories for all projec
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
index 4304dcd0c25..1edcf3d766e 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
@@ -5,7 +5,6 @@ description: Count of group entities with finished status and failures in GitLab
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
index 376e9bd5baa..69f38deae6d 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
@@ -5,7 +5,6 @@ description: Count of group entities with finished status and without failures i
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
index 5b0e4db64ad..4b771461d68 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
@@ -5,7 +5,6 @@ description: Count of project entities with finished status and failures in GitL
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
index 163a7f0ccd6..80e3a2dfe7a 100644
--- a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
@@ -5,7 +5,6 @@ description: Count of project entities with finished status and without failures
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
index f398fa3c16f..fff0745307b 100644
--- a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
+++ b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were cancelled monthly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
index 10344cffe5f..824cadc6d40 100644
--- a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
+++ b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were partially completed monthly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 8abe9b7e66f..a283ced7da8 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_change
 description: Count of WAU editing an issue title
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
index fad71037d79..3f888b83ba1 100644
--- a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/pipelines/charts
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
index b575d7abf6d..9d28083dab2 100644
--- a/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
index dd1b09ead42..da8bd8372e6 100644
--- a/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
index 27f8887cf9b..70028d86185 100644
--- a/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /-/instance_statistics/cohorts
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index 912386ac1c5..370cf7a3f50 100644
--- a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /-/instance_statistics/dev_ops_score
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
index a51c51fc6c2..8200576a27b 100644
--- a/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /groups/:group/-/analytics/merge_request_analyti
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
index 9a5109f436c..d03347a0552 100644
--- a/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
@@ -5,7 +5,6 @@ description: Unique visitors to/admin/usage_trends
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
index 424552f54e4..29953ab7de1 100644
--- a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -5,7 +5,6 @@ description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
@@ -36,6 +35,7 @@ options:
   - p_analytics_ci_cd_pipelines
   - p_analytics_ci_cd_deployment_frequency
   - p_analytics_ci_cd_lead_time
+  - g_metrics_comparison_page
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index eb85af4f7a0..9b9b83944bf 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 88ed638d23d..9745abf5408 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: The number of unique users who visited any analytics feature by wee
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index b513b694165..9f5a7abbb21 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who perform an action on a merge request
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index 2db98f5087d..db9ec65fa31 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who use code intelligence
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 29b224c7aa4..2922e5de9da 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per week with diffs viewed
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 55957fe4c4b..67bf860518b 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index bb698f7cad2..927053a592d 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per week with diffs viewed file by f
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index a1275a7bbeb..ab96036053d 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who created a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index 5ec666df078..461697c22a3 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who closed a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index 294a93a75d9..6c27af8605d 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who reopened a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index 7f2311f33ea..d372fe3ecbf 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who merged a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index 838fbf0e2d2..84755507b32 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who commented on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 5510109edda..ac664eb8b39 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edited a comment on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index b55bb571bd2..220be7e4ebd 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who removed a comment on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index 6d3aafa428a..fa27b375a50 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who added a suggestion
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index 7f4931eb125..5840707980d 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who applied a suggestion
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index cd1bf837b3f..9244afc1249 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing using the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 3995843b24a..ed66ba900bd 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing from the single file editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 97e7b0b849e..e32159e0914 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 2b136ef96dd..c9ef8e978c8 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing a file using the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180416_i_search_total.yml b/config/metrics/counts_7d/20210216180416_i_search_total.yml
index e2bdc40d887..f9ab259f9fa 100644
--- a/config/metrics/counts_7d/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_7d/20210216180416_i_search_total.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index 01a2cdaee26..51e47331240 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index 4f55e279459..446ce10f04f 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: 7d
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 e4089d589cc..9189f688ca9 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
@@ -5,7 +5,6 @@ description: Count of unique users per week to take an action on an alert
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 93228309855..466e1c3663d 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
@@ -5,7 +5,6 @@ description: Count of unique users per week to take an action on an incident
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 faa01b2c14e..806f43bce17 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
@@ -5,7 +5,6 @@ description: Count of unique users changing alert's status per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 88aae8134a4..8493e394a95 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
@@ -5,7 +5,6 @@ description: Count of unique users assigning an alert per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 56b27038a3e..a7fb949f143 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
@@ -5,7 +5,6 @@ description: Count of unique users adding alerts to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 40b42fd1be4..93cdf3305b0 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
@@ -5,7 +5,6 @@ description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 8453a7bf93b..e23e7554856 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
@@ -5,7 +5,6 @@ description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 ce7a34aaeb2..48ea4c288f2 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
@@ -5,7 +5,6 @@ description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 192e78b2675..e6078fbdf7d 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
@@ -5,7 +5,6 @@ description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 c15a71876c0..733866a55eb 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
@@ -5,7 +5,6 @@ description: Count of unique users adding incidents to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 5d7e5408466..8135df8ea75 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
@@ -5,7 +5,6 @@ description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 763e713cc23..3955cd66433 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
@@ -5,7 +5,6 @@ description: Count of unique users creating Zoom meetings about incidents per we
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 263d2d60274..0d4b71686d9 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
@@ -6,7 +6,6 @@ description: Count of unique users adding issues per that are related to an inci
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 3bd90957bb9..3e5c43746f0 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
@@ -6,7 +6,6 @@ description: Count of unique users removing issue that are related to an inciden
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 9b7d216a18d..23d777530f4 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
@@ -5,7 +5,6 @@ description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 03ea343b1da..f0dbaae8c0c 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
@@ -5,7 +5,6 @@ description: Count of unique users performing events related to the incident man
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category:
 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 7abfc39fb41..bca64798d7c 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
@@ -6,7 +6,6 @@ description: Count of unique users per week to create an incident corresponding
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index c630b1bad72..2af4e6523f1 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU editing an issue description
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index afd7ac16acc..933f1bf3e3b 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing issue assignees
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index 4a7590fa63e..352c5e44d47 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU making an issue confidential
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index eae4cf74b4f..41ba3cc3f79 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU making an issue not confidential
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index b59d309e25b..e12d8240d5f 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU creating issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index bce3c7466d5..0349cc014be 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU closing an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 8e7f0a92086..3d7bd3888f7 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU re-opening a closed issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 0a6436946a3..cb2f31a2c26 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue's label
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 39909e9d2f6..bbe4d122847 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue's milestone
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 1b20184f93f..b1c13ef367c 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU referencing an issue from somewhere else
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 1ef7e30cf80..f72c83ab3df 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU moving an issue to another project
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 7df346d1c0f..f42e99b4514 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU relating an issue to another issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index e493200cb7e..e8b06010a17 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU unrelating an issue to another issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 7609355ef9e..13c783fd07f 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU marking an issue as a duplicate
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 04c1c33b614..6a07d05d9ec 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU locking an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index 99a46162e24..69550cb65d1 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU unlocking an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 6c54cda8cca..1b686f6c0d4 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU adding a design to an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index 50591b27826..06f3416d58e 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU modifying a design on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index f25c8fab470..9c573914f88 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU removing a design from an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 8fc70434d77..89e331307bc 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue due date
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 66313eadfb5..c1e2d542cdc 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue time estimate
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 2ad1a1fc35c..48f4175f084 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU recording time spent on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index ca24e7b8d2e..9303f4e69ff 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU commenting on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 25d6d63f7b2..4bba82b80f6 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU editing a comment on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index a11431c52f3..6bbfe60613e 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU deleting a comment from an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 0421bd5e6f3..66b1fc7fb46 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU cloning an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 8fce94a17e2..a6fc0ddb086 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Aggregate count of WAU taking an action related to an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 8ba9912367b..ef6d014e491 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/approve` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index ce8b74e809d..045a9f902a0 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign @user1` quick action to assign a si
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index 3ca7b226545..7e431fdbec6 100644
--- a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/assign @user1 @user2` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index e7a9da77a57..85c653b9807 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign me` quick action to assign self to
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index 2bb14fd86d6..a790645be79 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign_reviewer` or `request_reviewer` qui
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index f30c48afe27..5008c48922f 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/award` quick action to set an award emoji
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 2fcfd76f2cf..38ea07b6020 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/board_move` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index 56666aa5c27..24e8c851811 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/clone` quick action to clone an issue.
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 5f66e29d64d..6eb1d9bfd1c 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/close` quick action to close an issuable
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 7044ec1cee0..06fd4b538cb 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/confidential` quick action to set an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index 477b01fe58a..a771810aeba 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/copy_metadata` quick action on a Merge Req
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index ba3122f506f..55b9720333a 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 2cbaad8e195..1db25e7826a 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 20a148487ed..97e12085fbe 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/done` quick action to mark a todo as done
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index 1862579b010..7afa7363f33 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index 6d91df37fff..f20c0e36ab2 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/due` quick action to change the due date o
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 2aa366e6189..9c223c90a38 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/duplicate` quick action to mark an issue a
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 51a8b104c13..94753292f22 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/estimate` quick action to set a time estim
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 162ed402b2d..533e5ad8f85 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 6f2cd99e56b..08cd4a64365 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index aaeda7d38c7..130b6ffca0d 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/merge` quick action
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 5c9333b86cc..8eff93b562e 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 9b0298c05ef..92eda899a36 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/move` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index 5f692ea8693..1bf03fc1339 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index bebba3c9c16..8da0f4a3774 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reassign_reviewer` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index 332b4a9d49f..e8895b910e3 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/rebase` quick action on a Merge Request
 product_section: dev
 product_stage: source_code
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index 30b34915504..30444a60ad5 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index 0676a68294c..3b293d9ad26 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index 851221e77a5..de974d4fa3f 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index c61ef9beb0d..4dcc0843134 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 6b27c442b53..54db78851fc 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 5e8b08a8b2f..64144163995 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_time_spent` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index 1286451c093..8fa1cdbf48f 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index 30230076606..73c4b090324 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index 6dea3beeffb..263ea183d4e 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 747db90fc0c..14b38ffc69f 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: time_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index f0ef4fc1443..11785ba504a 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index d59582d77a4..b5ab2742f28 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/submit_review` quick action on Merge Reque
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 45f12337aed..25312a6b141 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 2496a625ba4..f9c1aeb4c14 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index 8fa970a825c..735d81f6dc3 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 1cacf957c29..a58780072c3 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/target_branch` quick action on Merge Reque
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 7ed0c90fe63..33c21de6c3b 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index e626eb20f0e..cc5a60ee233 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index c15a1a910e1..b287ea65b0a 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unassign @user1` quick action on Merge Req
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index ade389e3109..d1c2c52e337 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unassign` quick action on Merge Requests
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index df8989017e4..eb1dc8bd781 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` q
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index f9bcdfae4e0..a284a0d8431 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/unlabel` or `/remove_label` quick action t
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index 0b85ab538d8..77478783baf 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unlabel` quick action to remove all labels
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index e0954fdb822..cc382ff215e 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unlock` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index a8c7c6d7f4a..7730da6efe3 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unsubscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index b041898637a..433abc4a325 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 6591335ab5c..b9d07941ac9 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index 20bc1976170..3a79b0a0cfe 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index b80ec9236a2..2f624977b6e 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index 7ecc4a9ffaa..d51581a30b6 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique actions done on projects and related resources (cre
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index d7c2bf1ad31..da7c483899f 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -6,7 +6,6 @@ description: Internal Tracking to count number of unit tests parsed for planning
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: code_testing
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index 6d7b16b9f3d..09fb34084f7 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index 46295dcdb00..805a168d407 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index 25deb6b9c3b..eaf2c4930a4 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing using the Static Site Editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index 66811db0a95..25a52ddb51d 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique Git write actions
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index 3b84b959cdc..333deea8921 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users viewing snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index 885f408188f..99cabcd6dc1 100644
--- a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -5,7 +5,6 @@ description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index 795acd44f85..fd639ed7840 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique user count doing commits which contains the CI config
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index a84d38cc106..e630943fdfc 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_st
 description: Count of unique users per week who toggled a task item in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 2b013d9bd6f..ae050ed0ac6 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
 description: Count of unique users per week who approve a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index cb199460b56..656337064d6 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
 description: Count of unique users per week who unapprove a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index a4793165d84..b79a947b047 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekl
 description: Count of unique users per week who resolve a thread in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 2f7a8f95e60..99ebc05a614 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_wee
 description: Count of unique users per week who unresolve a thread in a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index f274a3c84ee..0a67aee4a7e 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
 description: Count of unique users per week who edit the title of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index a33decb9829..a2f841eecc5 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
 description: Count of unique users per week who edit the description of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 2f973ca280c..2e4aa495841 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who create a note as part of a merge
   review
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index 12ab4d9e142..f8f180e6506 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who publish their review as part of
   merge request review
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 42350e2ed46..c463cb7d5bc 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who create a multiline comment in a
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index e97a2d484a0..cf9f1169c1c 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edit a multiline comment in a me
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index c3116458680..57a8467faae 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who remove a multiline comment in a
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 72a1a0d27cb..fc650755ef2 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
 description: Count of unique users per week who are assigned to a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index 523df4fc166..10479d26c35 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who mark a merge request as a draft
 product_stage: create
 product_group: code_review
 product_section: 'TBD'
-product_category: code_review
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index 85e3cb7fa2e..df6a63308a5 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_we
 description: Count of unique users per week who unmark a merge request as a draft
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index d38e248ab3d..26102beb2f9 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_wee
 description: Count of unique users per week who request a review of a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 3528cc2cdf5..cbb0885baa3 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_
 description: Count of unique users per week who add an approval rule to a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index 5745700f3b4..5d3b53fff07 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who delete an approval rule to a mer
   request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index 42b67c04587..d490f2ff877 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited
 description: Count of unique users per week who edit an approval rule to a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index 4dbf661eaa0..99943b483ad 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_
 description: Count of unique users per week who use GitLab Workflow for VS Code
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 4e7bd44586c..5f8ada9ac2f 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue
 description: Count of unique users per week who create a merge request from an issue
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 4c12bd72f94..154806d8d70 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
 description: Count of unique users per week who interact with a merge request
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: 'TBD'
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index e00e435cf88..fa1b01b029e 100644
--- a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index 3a522e9088e..f4e33e53c61 100644
--- a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index 71ceb5f2b1c..25609e951fb 100644
--- a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index a9cc39612a2..f07cd2e046c 100644
--- a/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index 3d65b0c40e2..42fb95c6667 100644
--- a/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Secret Detection runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: secret_detection
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index e6f8be30ffc..adf67977f9c 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -5,7 +5,6 @@ description: Number of projects using 5 min production app CI template in last 7
 product_section: seg
 product_stage: deploy
 product_group: 5-min-app
-product_category: five_minute_production_app
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index d3e606940ea..422ab92b81e 100644
--- a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index 5ef3202e2b7..7b2ebf820b1 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index 2cbe1cf6e69..8ef67ef48dc 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index 64ed870d8ef..0ebcc00379b 100644
--- a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 681c013a387..34ef4ef374c 100644
--- a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index e1898c66232..29a308e8d80 100644
--- a/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with SAST runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index e10586708bd..571530313a9 100644
--- a/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with Secret Detection runs
 product_section: ops
 product_stage: verify
 product_group: "static_analysis"
-product_category: secret_detection
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index 103bb221b98..332e522c181 100644
--- a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines that include the terraform base template from Gi
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index eb46f571691..f8c07beae1d 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Total count of pipelines runs
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone_removed: '14.3'
diff --git a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index 039e65bcbaa..0ed0342d8ed 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using one or more quick actions
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index d4bca957360..e5d08397792 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Composer packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 8c312a52af0..2abc15afbc1 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Conan packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 5e56465dbd4..57b851d7240 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of container images published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 828e3662601..6a5f5010b3d 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Debian packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 6233c2339de..7c0748dd38b 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of generic packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 3df457db03b..4b9d7df0c7c 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Go modules published to the registry using a depl
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index 8485e4013f3..b2bcc111441 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Maven packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 7d8c3585aa2..e4fe75251dd 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of npm packages published to the registry using a de
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index f2a0460bc27..48a08d9924c 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of NuGet packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index a0c74b4f002..84cbb71a20c 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Python packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 27863bdde3d..9478f660aac 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package tag to the re
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 967e8e5888e..ff92a09009a 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of unique users who published packages to the regist
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 85bacdd8f17..e7972ef2de0 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a Composer package to t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 78e2ad69fe8..ef942bfa457 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Conan package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 3ecf501dc1b..1ddb6cdbfa4 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a container image to th
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index e71927d20ee..22e130b9969 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Debian package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index fe0b86aaa07..34e43412396 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a generic package to th
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index cfda35c0968..32270cd0e3b 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Go module to the regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index fabc6d05016..9b838d2ff36 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Maven package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index f48c0a9a506..e8c047d80d6 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published an npm package to the r
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index bd4b8b006ec..900dbcbaa39 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a NuGet package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 5c52ee9137d..36959afc983 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Python package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index b934af222a8..6ab0f4f992e 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package with a tag to
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index d5576772b91..f22a975b1ae 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a package to the regist
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index b650f2ff5fa..90cceab86db 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users closing Jira issues by week
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index 4058804272b..70a3b4b0fcb 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users that cross-referenced Jira issues by week
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 968525a9005..b0745520870 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users performing actions on Jira issues by week
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index 6ea3c5d8e46..e9409f8c4b7 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique user count having merge requests which contains the C
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 3a7cee3cc4f..c96e9788e6d 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index 78f3c6d3d4a..924270e9294 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed time estimate of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index 6a5f5914ded..1e126b15d23 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed time spent on a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 6c10ec49dfe..123d8077a66 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index f26b088c356..4ae6853d08f 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index dc0bf804080..bff00f4f5a7 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index b27cec15caa..ef131a81f07 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index d56eec656ae..4823a57f853 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a no
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 671a2f4ac58..3d0123024c0 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 3a80c12cdd1..584b3daa51d 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a co
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index addaed1b2c1..f6a1f3c033d 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index a5f45d5ca39..d5feb708370 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who unlocked a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index 06b61434043..ecc0abe8b92 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who locked a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index 09d2a58fa35..be30d900c4c 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed milestone of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index fc28f4ee95f..9a2c6c2fd0e 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed labels of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 687100f1572..1e06166acc9 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed assignees of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index 9b8f57680e6..b6ddb3998f8 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed reviewers of a MR
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index 84c514f2b4c..df87cbc7212 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a single e
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: issue_tracking
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index b4085cc431b..d79b4877cf7 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a multiple
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: issue_tracking
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index 4e22dafd1a2..9ef1c5a9fb1 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of distinct RubyGems packages published using a depl
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index 5fafa692102..a99033e7a44 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of distinct RubyGems packages published by a user
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index 41948e72b14..93eb662f656 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the security report widget
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index f3e90cb077b..9a67d5aa2e0 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the code quality widget
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: code_quality
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index 096f2f0c7f6..035730674ad 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the accessibility report widget
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: accessibility_testing
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 51cb976a888..814b6c3352c 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users authorized via deploy token creating Terra
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index ad5002fe9b9..181d38b6fc7 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users creating Terraform Module packages in rece
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index 015fd1e99b0..1182681fa8e 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -5,11 +5,12 @@ description: Unique users that expand the test summary merge request widget by w
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
-status: active
+status: removed
 milestone: "13.11"
+milestone_removed: "15.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114018
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index 2822bc33d13..47f02104799 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking single file mode setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index 8e23a2aae8f..14804e70f4b 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 6a127785a51..0ef08b44129 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request whitespae setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index e63400107c8..7a1ee16a32c 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as inline
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index 2968d582466..300cf506120 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as parallel
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index 62fb89aa5c5..906865d82c2 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file tree setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index ea0d1039057..da3eba5beac 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index 0b791d84552..73bc515cd1f 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace enabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index f5ab68f120f..17ba249773e 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace disabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index 613368825ec..ef5ca0a03f8 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with single file mode enabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index 6eb1c55d098..2933fd90dd3 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with single mode disabled
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 02d537394f4..b6e1211d605 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -5,7 +5,6 @@ description: Unique users viewing analytics devops adoption
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "13.11"
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index f9acb05be3e..7743cfd2e0c 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing at least one of the code review events
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 6ceeef68c21..343e0105bf7 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Unique users performing actions on code review events
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index f5e8a10506f..2229e132eb4 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing code review extension_category events
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 3f688886a67..77bbceb7428 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users doing commits or push MRs which contains CI cifig file
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: pipeline_authoring
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index 378637ab14b..d6813b33e39 100644
--- a/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -6,7 +6,6 @@ description: Unique users viewing analytics group devops adoption
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index 5e5f8012a25..556c1467b43 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per week who load the conflict resolution pag
 product_section: 'TBD'
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index be7905f3908..cd4e487f982 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per week who attempt to resolve a conflict th
 product_section: 'TBD'
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
index 48a6f7b6f80..233d8eee381 100644
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: Distinct Helm pakages deployed in recent 7 days
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
index 2b144ddfea5..296a1a38b30 100644
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -5,7 +5,6 @@ description: Distinct user count events for Helm packages in recent 7 days
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
index 9b8408c193a..f41b5e82f40 100644
--- a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking diff view setting
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
index 4f96db892f6..77e864afc95 100644
--- a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
+++ b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who search merge request diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.2'
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 68bae7212c5..a2c698ddf5b 100644
--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/severity` quick action
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
index 485ad63052e..59b0cfbc6cb 100644
--- a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
+++ b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
@@ -5,7 +5,6 @@ description: Total number of weekly suggestions
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
index fa2952320ef..ae67e0bf6f5 100644
--- a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
+++ b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
@@ -5,7 +5,6 @@ description: Total number of weekly suggestions applied
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
index 4601cfb0860..453ed4a0a7a 100644
--- a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
+++ b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
index 8b2c8de3e40..f01d96f1292 100644
--- a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
+++ b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
index 3f10b6c28ef..d82b85be2a3 100644
--- a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
+++ b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
index 70f7ac7f736..3b25a67cf83 100644
--- a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
+++ b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
index 26d3d7780f4..6f58352d03e 100644
--- a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
+++ b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
index 5d22da58b33..bb12ebf8378 100644
--- a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
+++ b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
index f0bf840127f..be1e433ea87 100644
--- a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
+++ b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
index e191ce5b162..203d04e7c80 100644
--- a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
+++ b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
index 1659cb016ab..1206ac024d7 100644
--- a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
+++ b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
index 438f0eb337a..09cabad7dbb 100644
--- a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
+++ b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
index 33a4ec10464..f0363fa7f4e 100644
--- a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
index ca61949b607..407ab183d3c 100644
--- a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
index 1d4f411e4fa..5341e78877b 100644
--- a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
+++ b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
index 97cd0ecd07d..53104524987 100644
--- a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
index 0fb29c0c686..8b75aa27857 100644
--- a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
+++ b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
index 424aaebc483..b87657c5af2 100644
--- a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
index f6c5386cc45..46c8613b2ba 100644
--- a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
+++ b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
index 2947546da57..db6898b684d 100644
--- a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
index bfe8a69c98b..dceffd56578 100644
--- a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
index 589f51e1582..d542b08ce0a 100644
--- a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
index 89edc13d128..e9c424fe1c3 100644
--- a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
index b6925668794..21fe8bab6b4 100644
--- a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
index dbf739de6e3..c4491d08304 100644
--- a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
index 4718fe841d1..92c796ecadd 100644
--- a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
index 84f33f2548c..c69df0778d8 100644
--- a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
index 38c0485f8e1..c79d88ecd5f 100644
--- a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
index f4954107d43..70ba9d17d4f 100644
--- a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
index 8998597261b..59b0eeb67d8 100644
--- a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
index 6216a39d9f7..84a41a66490 100644
--- a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
index b7fd799f8a6..bfccf092dbd 100644
--- a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
index 0ff048bd50a..a7d65bf5c9e 100644
--- a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
index 91f7fd8a29f..91d5e7c871f 100644
--- a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
index 7e1a97b3d78..c4506a4c6c5 100644
--- a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
+++ b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
index 3a739ac16eb..29a7f26c3b4 100644
--- a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
+++ b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
index 12b2d3445e3..12724c83211 100644
--- a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
index 5161260f733..6a38808ac08 100644
--- a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
+++ b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
index 6771363d4f0..300e49eb20f 100644
--- a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
+++ b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
index f0597215cdb..378ab408e35 100644
--- a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
+++ b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
index e5ee6349a68..03f5b0e89e2 100644
--- a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
index c36507c86c1..bf2c2adb645 100644
--- a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
index 4f994b3b21e..b937905a07f 100644
--- a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
+++ b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
index b93751d3c30..df1e2f09f10 100644
--- a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
+++ b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
index b1dbd64ae25..efc6d93fbec 100644
--- a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
+++ b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
index 7b813f3c1c8..3b6a20534ff 100644
--- a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
index 833a103b424..fcb52d878fe 100644
--- a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
+++ b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
index 5ca5b632ed7..1842d0679e7 100644
--- a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
+++ b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
index 060893ca349..83929a5ff83 100644
--- a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
+++ b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
index b297836dbf5..292a5d6a0e0 100644
--- a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
+++ b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
index bdc019f53bc..5b81fbf7911 100644
--- a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
+++ b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
index 5eeb0b587f7..d43e4dabf23 100644
--- a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
+++ b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
index be803873da2..536ac4f3215 100644
--- a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
+++ b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
index 02848df7032..cb492c65d2f 100644
--- a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
+++ b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
index 31f8f31344f..f79d5d9ae90 100644
--- a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
index 1df7de7867f..ae5529149a4 100644
--- a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
index ffee4a62bef..c264b754d40 100644
--- a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
+++ b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
index b9601085fe1..f347141b4b5 100644
--- a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
+++ b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
index 3efb9e7e435..b2449cc62f3 100644
--- a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
index efdab0f1c35..df2b7395e18 100644
--- a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
index 878e5d1f08b..f2e7c316e21 100644
--- a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
index bc7c9914c31..18a68f4c026 100644
--- a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
index c627098b569..e4eddb4e80e 100644
--- a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
index 9997a733c84..7b1a3cf87fb 100644
--- a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
index 6286fb00725..ef42b0eeddc 100644
--- a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
index abe645e059a..9df544de7e7 100644
--- a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
index 3f3c491acf5..462ea74bde4 100644
--- a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
index f5036c5bd7c..9484d64ca90 100644
--- a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
index 80dfa5e52ee..e5f9d461145 100644
--- a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
index a0b5145dc32..e4896130935 100644
--- a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
index ffbac5590cc..2a4d00c417a 100644
--- a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
index c076bfed8f0..52782941af4 100644
--- a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
index 97d8bb1f7a8..020e9eebb38 100644
--- a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
index f14bd662bb4..93eb40f17bf 100644
--- a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
index 91e8e6d7126..694ba39e864 100644
--- a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
index 98d7cae5c2f..aa51bb8357e 100644
--- a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
index 8b2fb8cd127..bc2d67b0e66 100644
--- a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
+++ b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
index e641f623c60..7a5246477bd 100644
--- a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
+++ b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
index 1419e5894bb..97209c562ba 100644
--- a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
+++ b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
index d7d7e62b256..47baf8aa169 100644
--- a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
+++ b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
index 9a521247591..e5218cce3f6 100644
--- a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
+++ b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
index caca2d80d85..3271fbf5afa 100644
--- a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
+++ b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
index f87d5663cd0..ecdb7d8080f 100644
--- a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
+++ b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
index e5a5664aee3..7146f5fd802 100644
--- a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
+++ b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
index fa44a295b65..b0712342a6f 100644
--- a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
+++ b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
index 2adf9a396ef..dd0d9aabb5e 100644
--- a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
index a920ff72b7b..494714f0e7d 100644
--- a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
+++ b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
index 10183e79f80..b17e4e0a9a2 100644
--- a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
index 0d2e5ca9122..a000917f003 100644
--- a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
+++ b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
index 5cad30c5f0c..8eaf3968953 100644
--- a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
+++ b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
index 5fcd652a26a..188f8e0d48d 100644
--- a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
+++ b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
index f0f2afd434e..5b56c6d332a 100644
--- a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
+++ b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
index 3ca7a23618b..6a065c4c78b 100644
--- a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
+++ b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
index 6c8db9b7058..dcbc5f7d222 100644
--- a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
index 4a7c592cd09..42ce483cd1b 100644
--- a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
+++ b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
index d2942ef6f6b..b4c256d7642 100644
--- a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
+++ b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
index 307df73a622..c8428c46d2c 100644
--- a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
+++ b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
index 6624697c56c..3c9206498aa 100644
--- a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
+++ b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
index 97de705a4de..03d885facf3 100644
--- a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
+++ b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
index b89ef58fbc1..9497aaff0c4 100644
--- a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
+++ b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
index ee6c2eaa60b..eee672af685 100644
--- a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
index 414eb9bc7ff..9e2fc0a599f 100644
--- a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
index 982257506b1..16f237b436c 100644
--- a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index 41743fd820c..18376dbde05 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
index 4e2dfe4e7e7..d755076586a 100644
--- a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
index 13a7628fd56..73c08f38416 100644
--- a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
index 59bae76f3e5..ab071726082 100644
--- a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
index 0237f2914ae..f8c91d74954 100644
--- a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
index 05e1a9ab017..20d0506589b 100644
--- a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
index 88c9db04884..d6ef6ee1593 100644
--- a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
index 060f5b70ca8..7b2b26914bf 100644
--- a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
index 67d2a02358a..77875093c00 100644
--- a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
index f5ceb651ef1..3ac1980db0c 100644
--- a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index 9fe2fcedc8f..b485355d040 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
index 4bbe644cf05..87c43f783b6 100644
--- a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
index 8b997583966..c409047d921 100644
--- a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
index 2b9e53aec36..6a760e2a7e3 100644
--- a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
index d45893a2022..8dcb1af53db 100644
--- a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
index 9655f006c44..d026fb769ff 100644
--- a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
index 952afc72aec..28e5c92b6e3 100644
--- a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
index e08cb7f719f..14da0dacab4 100644
--- a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index 5b2d521fb07..09c37602d26 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
index b10780260cd..a50e3b025b2 100644
--- a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
index 5e40e73ec83..94e7d93ee91 100644
--- a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
index 37d4e3760d0..bc594a534c4 100644
--- a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
index 777413e4f5f..cbeb90bd7ad 100644
--- a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
index 450574ee2ef..fb4ec2a4f3e 100644
--- a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
index 2ba2a04de1c..0a84eb4f2c5 100644
--- a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
index 04ba99db306..34b6c010b66 100644
--- a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
index 9afd7e8e3f8..de6e5b504fe 100644
--- a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
index bba2b2bcfaf..ec8321e986a 100644
--- a/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
+++ b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unapprove` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
index 6fcf7df4c9b..b3b3f4edfe6 100644
--- a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
index 7fdce381a55..fd4284a8a3b 100644
--- a/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
@@ -5,7 +5,6 @@ description: The number of users who resolve a thread in a new issue through the
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
index 06952dd2050..084286a3a70 100644
--- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count templates with active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
index f13174a4af6..a80d43b4d0f 100644
--- a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
index 5f107f95479..3278ecdd07a 100644
--- a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.4'
diff --git a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
index 964b57c65be..ed38ecd50d5 100644
--- a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
index 4d75becbbc3..88c0de0e3e0 100644
--- a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
+++ b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were enqueued to start weekly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
index 19188213132..98c28c4ab98 100644
--- a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
+++ b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were successful weekly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
index db77985ad5e..9126a817cc0 100644
--- a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
+++ b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that failed weekly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
index 0234ff62765..ff3360c90fb 100644
--- a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
+++ b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 milestone: '14.5'
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 ee086b844cc..9b767fd27d6 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
@@ -4,7 +4,6 @@ description: Count of WAU using the `/severity` quick action
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
index 371e684e406..e3c9e71392a 100644
--- a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
index c27caf6248e..8098f1f248c 100644
--- a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
index 5b419846d35..7d0143c736e 100644
--- a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
index 5f91c203d6f..fa71e7cc8b3 100644
--- a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
index 7e1e436142a..6b806f1acb3 100644
--- a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
+++ b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the create file button in the nothing to m
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
index cfab4e79963..23843626b34 100644
--- a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/add_contacts` quick action
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
index 81c0740dba6..7560e92696f 100644
--- a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/remove_contacts` quick action
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
index 78a318cba53..cdd078b6c6f 100644
--- a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
+++ b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the delete source branch button after merg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
index 6a687646417..6c5aa0d1054 100644
--- a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
+++ b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the revert button in the merge requet widg
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
index a6221b0a1dc..c664f4f10b2 100644
--- a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
+++ b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the cherry pick button in the merge requet
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
index 4761f07cf17..31feab6ef77 100644
--- a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
index 344f60897bd..90c0d90d4eb 100644
--- a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
index 8b9b17b3519..52ab17805b1 100644
--- a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for DAST API latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: removed
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index ead9799711b..24b2e2c7ca0 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
index 4afd72d630a..3e8c119b695 100644
--- a/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
+++ b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
index 1f7be3ded22..a7d8d75e23f 100644
--- a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
+++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
index 4d74fb08f1b..9d536617030 100644
--- a/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
+++ b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index 6826e082e79..1f7cd61e3cd 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index ba1b01f2e9c..164ecf8134f 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
index 6677e5d3b56..9e48535077d 100644
--- a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
+++ b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the license compliance widget
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
index fc5dceec67d..2d49c59fe35 100644
--- a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
+++ b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the license compliance full report
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
index 1d4f024b361..efc0d42ce6e 100644
--- a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for DAST API latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "14.6"
diff --git a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
index 07375b2d712..4066cecfbc2 100644
--- a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
+++ b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the manage license compliance page
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
index 3cc1e18c738..e88c4016f6b 100644
--- a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
+++ b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking licence to visit external information websi
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.7'
diff --git a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
index e5003f969eb..b0e65aff36b 100644
--- a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
+++ b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.7"
diff --git a/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
index b98c4aefe7b..81ce3bde808 100644
--- a/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use GitLab plugin for JetBrains
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 value_type: number
 status: active
 milestone: "14.8"
diff --git a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
index ec725e331e9..0af017112ed 100644
--- a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/attention` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
index 275776eb793..636b0946dea 100644
--- a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/remove_attention` quick action
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
index e3b9e3623a5..9608fc0138e 100644
--- a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
+++ b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts of times users have executed deployment jobs
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 milestone: "14.8"
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
index cc04ade9317..f41d8d24092 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of Dependency Scanning CI template (
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
index 78256aeeea8..0970fdd8740 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of License Scanning CI template (Job
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_compliance
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
index 19bf2cf65ba..40f18a447bf 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Dependency Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
index c8977d75e9c..4b97f76578b 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for License Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_compliance
 value_type: number
 status: active
 milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
index e533d2a309e..8a0200f6bf3 100644
--- a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
 description: Unique users updating a work item's title
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
index fbc8e23b018..d5c0eb786a5 100644
--- a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
 description: Unique users creating work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 4520652ddf1..4443e46fb8d 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_plan
 description: Unique users interacting with Plan features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 59543e71dcb..3064b209b7a 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_project_management
 description: Unique users interacting with Project Management features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 6dc426231e9..9ddca3845cd 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.users_work_items
 description: Unique users interacting with work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: product_planning
diff --git a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
index c47c1fb51d5..b00923c21ea 100644
--- a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
+++ b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
index da30c60b823..82a80a35634 100644
--- a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for SAST CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
index f60936e8492..dc0a6a2df22 100644
--- a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Secret Detection CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
index bb487abef6d..b15383bb930 100644
--- a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
+++ b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the error details page
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
index e75e6a20c81..61f16f3dd98 100644
--- a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
+++ b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the list of errors in the project
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
index 0642003f672..7f6c1d24617 100644
--- a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
+++ b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
index 75b4e85a2db..387fd073cff 100644
--- a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit use of Secret Detection CI Latest templa
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: removed
 milestone: '15.0'
diff --git a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
index 81ee9ea1a68..ee3338f8b75 100644
--- a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of SAST CI Latest template (Jobs fol
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: static_application_security_testing
 value_type: number
 status: removed
 milestone: '15.0'
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
index e40a7d4cba6..3cdbd2976e0 100644
--- a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -4,7 +4,6 @@ description: Total unique users accessing error tracking routes
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: error_tracking
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
index 272bd61d336..61d62e265c4 100644
--- a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per week who use the GitLab CLI
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: editor_extension
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
index e464f1ee198..a13c9d88d28 100644
--- a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
+++ b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
index b59129cea27..b84da226e29 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb commit diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
index 30947b412fe..9d88e9729dd 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb MR diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
index d1f331ac1e1..16ef1a12d45 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
index d57c100ec1e..898355e90ff 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb commit diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
index 64d856782c2..a826b41f7d7 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb MR diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
index 3d01988de75..dfc5b66a064 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb diffs
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
index 55f2b54a373..48e617560fe 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
index 0ce53e6433e..b10aa57097f 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
 product_section: sec
 product_stage: secure
 product_group: "static_analysis"
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
index f668646eacb..7a58d4a00dd 100644
--- a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
+++ b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
@@ -4,7 +4,6 @@ description: 'Weekly counts of times users have executed katalon_tests jobs'
 product_section: 'ops'
 product_stage: 'analytics'
 product_group: 'pipeline_authoring'
-product_category: 'pipeline_authoring'
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index 9146e2c7c8b..1c2ed03537f 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Counts unique users for timeline events create, edit and delete eve
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.1"
diff --git a/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
index 681fed23d11..a06e08f99bf 100644
--- a/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
+++ b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Time to
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
index 2275bf185d8..1ecabfa8fcb 100644
--- a/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
+++ b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_approve_wee
 description: Count of unique users per week who submit a review and approve
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: dev
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
index 16029f05626..8819a7206b3 100644
--- a/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
+++ b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_comment_wee
 description: Count of unique users per week who submit a review with a comment
 product_stage: create
 product_group: code_review
-product_category: code_review
 product_section: dev
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
index 032ecc838b4..aa3a3226909 100644
--- a/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
+++ b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts of times users have executed verify jobs
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
index 17486482ad1..e3f0768417b 100644
--- a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
@@ -2,7 +2,6 @@
 key_path: redis_hll_counters.work_items.users_updating_weight_estimate_weekly
 name: users_updating_weight_estimate_weekly
 description: Unique users updating a work item's weight estimate
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
index 2a4889cc3ac..5bc4d01026b 100644
--- a/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
+++ b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Change
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml b/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
index a1cf41b62f0..c2a18809ae9 100644
--- a/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
+++ b/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Test Su
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
index 73c5799d984..ddd4e5d7208 100644
--- a/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml b/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
index a3616e92e6f..5f2b0fbe225 100644
--- a/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml b/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
index 728ca303438..32052c94df1 100644
--- a/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml b/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
index 70a2bab68d8..0c1c24572fa 100644
--- a/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml b/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
index a25ac7de33c..a3ab147f95a 100644
--- a/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
index 6ee30064f91..19a5bf2565c 100644
--- a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Fortify FoD SAST template
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
index a234b29127d..29c15c8c6c0 100644
--- a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the Fortify FoD SAST te
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.3'
diff --git a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
index eaed8420bdb..d9cf5c6fb15 100644
--- a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
+++ b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_dates_weekly
 description: Unique users updating a work item's date
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml b/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
index 72b59b312e3..aef0583ef2f 100644
--- a/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
+++ b/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Accessi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
index 3d247a80f1e..a0793d16dba 100644
--- a/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml b/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
index 7dc508c1faf..88f1e6fba0a 100644
--- a/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml b/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
index f8f7f01b4bd..aed7b029607 100644
--- a/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml b/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
index ad7e54291b5..36672eeb8de 100644
--- a/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml b/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
index e617afa70f6..4e4dfa3a8fe 100644
--- a/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml b/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
index 029103609cd..8247cd8cadf 100644
--- a/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
+++ b/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Code Qu
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
index d6e9d88d395..27320d37f4c 100644
--- a/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml b/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
index 7d35f90ff4d..8c36519531b 100644
--- a/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml b/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
index a0c94702a5f..5241eb56f45 100644
--- a/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml b/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
index c88c435eaf2..57576f84cd6 100644
--- a/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml b/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
index 4ef43c77c5d..8fbb2458272 100644
--- a/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml b/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
index 26d4709a35b..462b47df3fa 100644
--- a/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
+++ b/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Terrafo
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
index 85017ed6ae4..7c6c702856e 100644
--- a/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml b/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
index 7a73af7a042..34811b295ec 100644
--- a/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml b/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
index b9c2593f3cc..1ed68b3bc62 100644
--- a/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml b/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
index 8eaff0bd1ea..d892ae32cff 100644
--- a/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
index 55de00b858c..18488c3bc24 100644
--- a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
index cd18a2433de..efb97bc1b95 100644
--- a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
+++ b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
@@ -4,7 +4,6 @@ description: WAU of the Agent for Kubernetes CI/CD Tunnel
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
index 650f85f765b..2b23d491c5e 100644
--- a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
@@ -4,7 +4,6 @@ description: "MAU of junit test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
index 6e9415bdc42..6f8434b6ef0 100644
--- a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
+++ b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the License
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
index c3a8d7bfdfb..8523b7c3b1e 100644
--- a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
index 69083c5ca2c..d7603755145 100644
--- a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
index d145ae31f38..e2eee89bf6c 100644
--- a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
index 58c3d89497f..0ca921f7bb0 100644
--- a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
index d8d9637f920..b68cfe16273 100644
--- a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
index e249dade5ca..c00883ab558 100644
--- a/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
+++ b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users created timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
index 82be8c1d859..3abcf82534b 100644
--- a/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
+++ b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users edited timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
index dbe8ad10298..1491b37916a 100644
--- a/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users deleted timeline events
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
index 4e1ec52769e..d3a774495b9 100644
--- a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
+++ b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/ready` quick action
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 data_source: redis_hll
 status: active
diff --git a/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
index 5b10a9a93d4..eec7b533960 100644
--- a/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
+++ b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/timeline` quick action
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
index 5a07581ac29..522d7db9f1c 100644
--- a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs using the stable SAST Ia
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
index 07ad434778f..4703f559f9c 100644
--- a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST jobs using the stable SAST Ia
 product_section: sec
 product_stage: secure
 product_group: static_analysis
-product_category: SAST
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
index c2a9f72ec8b..48fbe12bfcc 100644
--- a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Dependency Scanning CI Latest template (Jobs fold
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
index 8e7c6e8cbaf..e08a28e4d6c 100644
--- a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI Latest template (Security f
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
index f3cb628da5a..dba0530dc70 100644
--- a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for License Scanning CI Latest template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_scanning
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
index 895e6c3cf91..a1709e34511 100644
--- a/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
+++ b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published an rpm package to the r
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
index baa9796fff0..b77aafc4f38 100644
--- a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit Dependency Scanning CI Latest template (
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: dependency_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
index cf4727f2da4..67c3de71112 100644
--- a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit License Scanning CI Latest template (Job
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: license_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
index e4901cfa05a..a445657c004 100644
--- a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit Container Scanning CI Latest template (S
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: removed
 milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
index 37f539d1ec4..5d4d15d465f 100644
--- a/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of RPM packages published to the registry using a de
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
index 768390de49d..58e9a95abe2 100644
--- a/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Coverage Fuzzing latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
index ea231267825..0ddba8f0bf4 100644
--- a/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit Coverage Fuzzing latest CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: removed
 milestone: '15.5'
diff --git a/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
index aad949867cf..bef6622bfdd 100644
--- a/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
+++ b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's iteration
 product_section: team planning
 product_stage: dev
 product_group: plan
-product_category: project_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
index c136840fccf..50a6e17a902 100644
--- a/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
+++ b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/link` quick action
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.5"
diff --git a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
index 55e651328e6..3f7ab5e152e 100644
--- a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
+++ b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_labels_weekly
 description: Unique users updating a work item's labels
-product_category: team_planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
index a06f0a5bdbe..0d3e375fa83 100644
--- a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's milestone
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: team_planning
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
index 86fefb257f6..900c298f7b2 100644
--- a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
@@ -4,7 +4,6 @@ description: "MAU of coverage test reports uploaded by customers per pipeline"
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
new file mode 100644
index 00000000000..35d643068ca
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_confidential_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
new file mode 100644
index 00000000000..5abf36162e4
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_note_notification_weekly
+description: Calculated unique users to trigger a Slack message by creating a confidential note by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_confidential_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
new file mode 100644
index 00000000000..9c3e41827e9
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_deployment_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a deployment by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_deployment_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
new file mode 100644
index 00000000000..417308db301
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_issue_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
new file mode 100644
index 00000000000..f74bf9e4877
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_merge_request_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_merge_request_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
new file mode 100644
index 00000000000..951954de37b
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_note_notification_weekly
+description: Calculated unique users to trigger a Slack message by creating a note by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
new file mode 100644
index 00000000000..5ad2211cf02
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_push_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a Git push by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
new file mode 100644
index 00000000000..db2e093039f
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_tag_push_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a tag push by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_tag_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
new file mode 100644
index 00000000000..6fc9cfa31b7
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_wiki_page_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_integrations_gitlab_for_slack_app_wiki_page_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
index 8c081dd8a77..f1bf2780288 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of Container Scanning CI template (J
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
index 7535ebc57a2..577fdbc16c1 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI Latest template (Jobs folde
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
index 4f79b514af5..f933295c3c0 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI template (Jobs folder)
 product_section: sec
 product_stage: secure
 product_group: composition_analysis
-product_category: container_scanning
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
index 751337d22d3..9a7b2ae4b8c 100644
--- a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
+++ b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Securit
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
index 1f123bb8c68..02fb440839d 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
index 925b2730c2c..307022719ba 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
index 84163e934cb..65962e2fd05 100644
--- a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
index b5729bc1ec9..7dc18545ecf 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
index 061b3a0fb30..e42e0949b07 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
index 0ab553a7b5c..99dd2788825 100644
--- a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique merge requests created per week
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index 138638a0f45..e1d899d5193 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per week who removed a comment on a design
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
index 38e6e0469f4..b3b80ca1c98 100644
--- a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
+++ b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
@@ -5,7 +5,6 @@ description: Count of weekly active users for pipeline insights features
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: testing
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml b/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
index 97659c7ed63..20e1bb4cb8a 100644
--- a/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users (weekly) who read runner job statistics
 product_section: ops
 product_stage: verify
 product_group: runner
-product_category: runner_fleet
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml b/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
index cbbd4f7cc2c..c852516c5fa 100644
--- a/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
+++ b/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly count of unique users who created a pipeline with id_tokens
 product_section: ops
 product_stage: verify
 product_group: pipeline_authoring
-product_category: secrets_management
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml b/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
index d9c150f4b62..29c19241e6b 100644
--- a/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have pushed a tag to the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml b/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
index 19e3866d862..0424c54e4f8 100644
--- a/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have deleted a tag from the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml b/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
index e719ca0abda..9bf92728540 100644
--- a/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have pushed a repository to the regist
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml b/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
index 46f66db821a..a2e34093b66 100644
--- a/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have deleted a repository from the reg
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml b/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
index 0b20ec93c71..c4f217ae068 100644
--- a/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have created a repository from the reg
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
index f38588a1443..3d2ccd4083a 100644
--- a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
+++ b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
index 3f5fbfdcb86..4f307e94be7 100644
--- a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
+++ b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module Base template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
index ca16ef38e82..6d478b648ce 100644
--- a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
+++ b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for API Discovery CI template
 product_section: sec
 product_stage: secure
 product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
index 2d76d88e2e7..b610e168631 100644
--- a/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
+++ b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were cancelled weekly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
index 9bc42eafd23..1ffbd56f578 100644
--- a/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
+++ b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were partially completed weekly
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 7e5f41d54f5..84a039c330e 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -5,7 +5,6 @@ description: Total Gitalty Servers
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 0e37a6c19b5..54011fb87ce 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -5,7 +5,6 @@ description: Total GitLab Managed clusters both enabled and disabled
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 8f3749cc481..74fba616287 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -5,7 +5,6 @@ description: Total visits to VSA (both group- and project-level) all time
 product_section: dev
 product_stage: manage
 product_group: optimize
-product_category:
 value_type: number
 status: active
 time_frame: all
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 e0f5b6d986d..8b0fb9db517 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -5,7 +5,6 @@ description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 b824d0a5467..676308f9fc4 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -5,7 +5,6 @@ description: Count the total number of log views
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: logging
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 24d6586559a..815d440b63c 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -5,7 +5,6 @@ description: Count of service desk enabled projects
 product_section: dev
 product_stage: plan
 product_group: certify
-product_category: service_desk
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index f0045c46d56..03761796cd4 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -5,7 +5,6 @@ description: Count of service desk issues
 product_section: dev
 product_stage: plan
 product_group: certify
-product_category: service_desk
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 0cb2d37cbf3..7a2aa8e3639 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -5,7 +5,6 @@ description: Count of all comments that contain suggested changes
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index fb465ace311..a08f20261ce 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge requests
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 3713aafe259..312f486aa67 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge request comments
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index c71cfdcc3c0..2f524d9030a 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge requests created
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 5cf80a4b438..0b10593be23 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of the number of users creating merge requests
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 milestone_removed: '14.10'
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 594832cae4f..f42c47d9142 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -5,7 +5,6 @@ description: Count of unique users who create suggestions in merge request comme
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 0ab6b1178da..a03db93064d 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -6,7 +6,6 @@ description: Projects with Auto DevOps template enabled (excluding implicit Auto
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index b4f194b147d..1dbdd608c38 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -5,7 +5,6 @@ description: Projects with Auto DevOps template disabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index 81714863df8..ff1174d0c26 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 35f4706cfa5..2fc86649c4b 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index c7b45d0cdb6..d6d5228d0fe 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 1e660cc2623..6c818d48782 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index fb335e9811c..804e25da11c 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index 67e21b57030..c4d4f14fc2c 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently disabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index fc22e4deb5d..8ebcf09d7a2 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to proje
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index 154926ce1cb..59b42f1cabe 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to group
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index bd91e116f6b..c9afefabf6c 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to the i
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index f3ba6bb42dc..6e9c86ea00f 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 7c0df4a79fb..9d909701fe8 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index b56a1e17984..4c073d61844 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 4d727e9c7d7..075cddb387e 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index e59c89952aa..cb308890bd4 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index b42537dab1c..cad1d25e732 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 2ffd21a39a4..e7ab1a3f950 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Crossplane in
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 0735993d627..033d912d880 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Prometheus in
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index c3a30bf8452..a460b40ed81 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Runner instal
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index 08f543609b5..bc142676e6a 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 7a303ed2f1e..54c96b5bea7 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index d4870126fb0..b7d202d4c33 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Jupyter insta
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index 415c9fc7811..bd067804cbb 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cilium instal
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index b0fa6e65e07..3e4a4c6a7af 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index 7c97d38a300..537d29f11fa 100644
--- a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes registered agents
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index c96ab785fbb..143ebaa5b0d 100644
--- a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes agents with at least one token
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 490d267a856..8a66dd6ffe5 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -5,7 +5,6 @@ description: Count of projects with Terraform MR reports
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index 27c1087a3a7..b189d0c66a3 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -5,7 +5,6 @@ description: Count of projects with GitLab Managed Terraform State
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index eed669c8583..82eb2fb5998 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -5,7 +5,6 @@ description: Count of Terraform MR reports generated
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 3540b0bf02a..746bb8bf3e4 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -5,7 +5,6 @@ description: Count of GitLab Managed Terraform States
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index 43731d35061..82bfacffaf3 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index d044a7bfbe2..52c023961f9 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index dd80a467825..8d9897318a4 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index d0bd9329b6f..1cab6eeee45 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index 958760f57e6..0a8899be1a3 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 63fd19ddff2..510b66c02a2 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 6e8761ae414..be4ca306eff 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters currently enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 02730ce5bc2..41a546f73ab 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index ad7c5dd99c9..1711589636d 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index fc7710bc490..ed86490ef9c 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 6a621914e27..8007b2fc277 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index 5f81b41a670..bfe2a41c6ef 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index a16a70d822e..92e39a8aa36 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index c036e3ea7b0..263102b5a3b 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index a36f8deebfc..741036b7cd3 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 1a189b8d0da..7afa52d0aa5 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index b443721868c..4192eb5c3f8 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -5,7 +5,7 @@ description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index 7e82df12c95..6e39dfdcfc9 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets processed by ModSecurity since Usage Pi
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index c034d791224..23485e5d7d2 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets identified as anomalous by ModSecurity
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index cbdd3ce0261..b1141edc39c 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets forwarded by Cilium (Container Network
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 2b1dc57255d..28bf9101656 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets dropped by Cilium (Container Network Se
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 1dce2aa9922..3b28b7e3c93 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is set to logging mode
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 2b1a487838e..5bc509d3b12 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is set to blocking mode
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 8794bfec930..a440204f0aa 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is disabled within Ingress
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 9781fa90536..27ed192f1cc 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity has not been installed into the cluster
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index ee7f91cd1e8..e8ea8707f0f 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -5,7 +5,6 @@ description: Unique builds in project
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 0192d7846b0..773fe5b7844 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Total pipelines in GitLab repositories
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 03958d43d99..b2c70204679 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Total pipelines in external repositories
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 1b4c8cfc73b..0fee8cceb9b 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Total pipelines from an Auto DevOps template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index 12ec851fef7..4f78883ef1e 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Total Pipelines from CI files in repository
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index f3f13553663..68d8a3ee190 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -5,7 +5,6 @@ description: Total configured Runners of all types
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 14a305c5c4d..987329530c4 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Total configured Triggers in project
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index a498f4d0e6f..3f736cf96d6 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -5,7 +5,6 @@ description: Pipeline schedules in GitLab
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index bae726ec222..c44a35960c4 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering jobs
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index c0ba52c36fa..78a0f008141 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in external repositories
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 4b126eb82b9..3ff3cfacef9 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in internal repositories
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index abdb32a404f..033b680f496 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Total pipelines from an Auto DevOps template
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index e43db505fb3..ebb0e3584c3 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Total count of unique users creating pipelines from CI files in the
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index df4fad9881a..7b78b52d913 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline schedules
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index bfd90a78524..8a9a3ce892a 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct Users triggering Total pipelines
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 485d965a428..f2260737c7e 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline triggers
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 416c4f739e9..19b165263a0 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -5,7 +5,6 @@ description: Count of web hooks
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category:
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index f5d77814ff9..3f334dc72f6 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index e2ee8440616..0e88289e9b8 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 0fc5c5321ef..78fcd3d5a17 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index 70047243025..ad5d520f239 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index e5bd8119cef..4bfbcbea97d 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index df2237ce08d..992f8a021c8 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Asana
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index d5e61e86f48..389f7c60088 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index d3b8252b5bf..390f5de3b10 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index 0faa5a7f435..04dde10ae73 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index 1fcf673aba2..e6506b521c4 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index f1d8dd731dd..6f5071302f5 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index ebbdba6c097..be8f1922b55 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Assembla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 7e1530aa6e6..0e4fee17e6a 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index cfc1d7d7f39..127ca2540cd 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index 8965c65ed6f..30e1af14ed4 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index b07649a858c..de283cc42ea 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 1fcd94588bf..dae517f9711 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index b2216f34b48..171d6defe06 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Bamboo CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index c6a0e9c4654..4ff1b059d68 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 1c4be08b4da..de93b1c1b52 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 41a36dfede4..a520b0b0eff 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index bc9cc8c78c2..85448689f4c 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index d034b007408..9a545dd1add 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index b9b92f72f02..b1991a2159c 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Bugzilla
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 0c359862309..f37202ab991 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index 363671ad07e..b1b1d2dec23 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 14ffea5ffb4..f8a8d5e7c8d 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index 39451d3ae53..c1ff1a6706e 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index a789fc50df4..ba1aae6eed0 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index f846e126f3e..a24f817c648 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Buildkite
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 816f153d252..585cd495667 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index e87e0748062..74d0023e7be 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 00f32987f4e..561e1ed76cd 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index a2c18935954..662a8c3aace 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index a09a7f7cb4e..756a7c7da1b 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index 55780ebfef1..b38fb1669e0 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Campfire
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index ec23eae4aad..241be154181 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index ae6caba5551..aecf743467b 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 720325f1ee9..a0be5b61109 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index 521f29949c1..d26c1ed6c89 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index 1fc45db4903..e8e6d44811e 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index e9c0d456ab0..0c3f0d38dbe 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Confluence
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index f3ee6b40bce..9de86ec786a 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for a Custom Issue Track
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index c9b11d6c5e9..03ba2cc240c 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for a Custom Issue Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index 110f6cc9606..2216d415bf2 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for a Custom Issue Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index ae72b015264..8a15205ef73 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for a Custom Issue Trac
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index 22b6fbfe846..35c79a5036f 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for a Custom Issue
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index a047b76b5cb..88131008b06 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for a Custom Issue T
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index a228c98c52f..137608e391c 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index 86ffb00edc4..57f02a085f4 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 47d111dc895..156185b3ae7 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index d508e171a7a..7e325fbabc7 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index 478151f1889..bcf909b7908 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 1016a71b1c8..03f7cee6039 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Discord
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index e8511564bdd..4a9f00fcb65 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index 3a5ce0f3882..aa1f533f8cc 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index 80e017c5a2c..8d400caff33 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index b071268f48c..4aee85aa6a8 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index b9fafd7d3c8..ebe7a2d45ce 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index 60b5c5bf7c8..d21efb0213f 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Drone CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 47f094738d0..231c025a224 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index 7c67463eba3..aa03838911d 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 387874eb108..b99cff392ad 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index a1588510b2b..23ca85503d1 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index 892249b795d..4a44bbb7e1e 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index a02c183202d..f718316d2b1 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Emails on Push
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index f2d71a1a775..0c11f2b2a30 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index e7cb654e8e5..2a1f9c976ea 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index b80bb0e6902..a531b187420 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index fbc863ee474..53701a86784 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index f27b94f9b54..ad37b6ade29 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index 7f6ca0a013b..a9d28ca6d88 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for External Wiki
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index b88351eb4dc..edcbc344d87 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index f77fe5ec728..6a7da541138 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index d3ed9f36425..68d3ed10346 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index f22e6e6bc77..d94b07a151d 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index a291191eaeb..4d8b1f0f8a0 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index c3c4a01a809..b55b9132a4c 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Flowdock
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index 14865b2dffc..774a592810d 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index 0dcb3881909..cb11d7ff1a0 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index 0d60c70c6e2..5d92d0b81b6 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index 4208f647cf3..d0e42de5086 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index 7168c788670..0c67c33eeb2 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 45465412b80..8fa597c7dd5 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 915c634cdb3..737e9696f14 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 5391dda3b7c..ac3d2ebe91a 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 7bcb8206beb..2be621c6d35 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index f30e667b316..591fd17e33e 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index aef3e97590f..ca710cb7edc 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index ff4e3d9d0b3..e0da8100b3a 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for HipChat
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 0a01091482f..5d100486ecd 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index 12faf9b8871..ca6cf2cb395 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index 1717439aad6..d88a90223eb 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index edb31b01c5e..468b55d632d 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index 5aab65d8491..b8dd0ee7aea 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index d724dccbd82..03a1af03ce8 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Irker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 85eb568a586..90f7f20bb83 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 336eea6884a..df8ac5fa50b 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 3475c1d4046..bf8d582550c 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index a587373aa24..c79f694bac9 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 8670bf8ccc2..69d892c7b3e 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index 1cb7931cf48..2766a6e1e3c 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Jenkins
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index adfaacfae0a..2c09473aca2 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 3464df2ef60..fd0b74c9d8a 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index a77057f5a53..3f5a28774a0 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 444f1c79ca9..7c1561e72d7 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index 4a0097e21ba..415b8665dc3 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index 6ff87cde23f..c765657cb0f 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index 4d351b42abb..70ee1313d4c 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 8036eff1e67..a034a351516 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index c4cc0f0d9c7..2c568ebcbac 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index cdde4ac4027..8680abe82cd 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index 240a59a8b1e..e417fd72a8a 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index f7bb7cb1a3e..598fb293026 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mattermost
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index d2a787ffa32..e884e462765 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mattermost (slash co
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 6b8c43319c6..13221f47c57 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mattermost (slash comm
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index a9703666f63..3691f524c22 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mattermost (slash commands)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index 0e498eaf251..c17fe82c500 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mattermost (slash c
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 5f498994eb6..02f684972b7 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -6,7 +6,6 @@ description: Count of active projects inheriting integrations for Mattermost (sl
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index 804100472b8..21d4aae8a0a 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -6,7 +6,6 @@ description: Count of active groups inheriting integrations for Mattermost (slas
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index 6b517b8ea65..1ab66a9b9f4 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Microsoft Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index 75bc1c38b85..2a3fd51cd1d 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Microsoft Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index 0bd44801ce0..78ee7a08864 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Microsoft Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index e5fbd0dd3b6..7cf2319dcb4 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Microsoft Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index de36020f9e5..13d60a55b81 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Microsoft Team
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index 0f17bfc7fb4..faf3657cb62 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Microsoft Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index f598ea26661..4e6b37f4b6e 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 25feaa36b23..f5c014370cc 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 61d0d5e1341..a498548b841 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 7cf1c495a94..20e0e354d43 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index cc61aeab951..9eaf4d09eb9 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index 87e89a24f0b..9d94c971dc7 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Packagist
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index e23ac62c864..a15df37f468 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pipeline Emails
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index 8e969cd2254..5be9cf45186 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pipeline Emails
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index 9fccfbfb67e..14335a4a6c6 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pipeline Emails
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index 253d76935dd..83aa8997e86 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pipeline Emails
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index c43f3484f35..705c4b77497 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pipeline Email
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index 4e03c0cf990..5b3d48d2a58 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pipeline Emails
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 39be8cbf49c..1bc23715ecf 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index ef3d5627379..3eaa25f2ff3 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index b54e62f535c..0f33662ab50 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pivotal Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 931c9b981f6..1cc495a5413 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index beaf20266af..731fefb4110 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pivotal Tracke
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index 55f9346ac0f..4a8b3083608 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 7f6a57168d9..602a111de7b 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index 897c531a6f7..aa7ae2238b8 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 1f0cca6305d..10fd599f612 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index bfaf2726283..8977c57d6a7 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index a71e5f50fb1..fd1a2041563 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index c08a8f4cc90..aed415e83a7 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pushover
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index c058489c438..8fd63c93316 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 95c566730bb..6c5d5b3f0ea 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index c3806d83cf9..380c4a29475 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index c6990f3a55d..446bab8c9f1 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 968b5a2c71d..572568dce81 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index 521ddf7e182..522dee6436c 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Redmine
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index a885f965100..0ccfcf4a265 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index f7c35542615..e75fcb1d155 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 5253bed85ca..5b6ae8cd466 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 707d61aed19..e1e7a8357ca 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index f402f2b39d3..95dd89a1b6d 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index d83501b3273..e4200e8c9ad 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Slack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index e0a75a66df5..c597e92eda4 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Slack (slash command
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index d53b0333205..e0a2ad4160e 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Slack (slash commands)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index ce6a1ae807d..d79ab237338 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Slack (slash commands)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index de0bd69b1d9..becd19567c7 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Slack (slash comman
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index cb3ae4b9b14..945d68d6017 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Slack (slash c
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index d075715daae..dcc4de87d47 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Slack (slash com
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 10c1f56070a..6d4935fafed 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 5171ab2c2d1..bef5b278420 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index b6845efeb28..d6f5fde5cb2 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index 00f423a9169..92ef88178d2 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 917579478b5..56ca14fecc2 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index 5a82830dea5..a192e6edb8d 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Teamcity CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index 6aa78eaabfd..82f3d56b1a5 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index 623c2389073..fada3445343 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index 47731d1b5b9..abea902b74a 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index 20deb22c0cb..daa8f332c46 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index d75f316c69c..c6fa0cf0fea 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index a4e9de64cc7..979f61dab4f 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 92d93cecdb5..57e2b4f201d 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index 4a40e435994..383272d170e 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index 3360b45093e..fb08834235e 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index a5e4dc2cfa6..17d0906668b 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index 2fe2a61187e..38e29e7f5f9 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 8a87a1cdc02..7627e2986a6 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Webex Teams
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index a8625a464cb..b3f285d7cc9 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 0ee62f379e8..d45589eeb18 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index 9334ef68345..d3dc6ecc2c5 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index 24d6440afb6..e7ec0b8ab85 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index cacc694f002..17d262de18b 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index 1286a306aef..afe4792f22b 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for YouTrack
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index a22520cb97d..c196d017874 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Software (server)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index 092036b3a5b..c82411850d5 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Cloud (Saas)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 158e18a738e..29edaa6ab3b 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Cloud (DVCS Connector)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index a436d0dddae..9673956c7e1 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Software (DVCS connector)
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 146b3217514..7477fd3cdf3 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -5,7 +5,6 @@ description: Count of personal Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index c60a82e9ef0..74e3ac6e97b 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -5,7 +5,6 @@ description: Count of project Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index 44585ed6916..a67a62716c7 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -5,7 +5,6 @@ description: Count of commits made from the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 63149b86e0f..c18feaacf6d 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -5,7 +5,6 @@ description: Count of views of the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index f620447e615..29252f16e73 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of merge requests created from the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index c785e95e105..5a59b88ac79 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -5,7 +5,6 @@ description: Count of Live Preview tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index cd64a877341..04d14f57470 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -5,7 +5,6 @@ description: Count of Web Terminal tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index bfd0b69401e..fc7dd96d4ae 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -5,7 +5,6 @@ description: Count of Pipeline tab views in the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index 03e45717517..9dae9e8aaad 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -5,7 +5,6 @@ description: Count of comments on Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 9c69c99d694..719ae81b0d3 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -5,7 +5,6 @@ description: Count of newly created Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index d8fee7daa90..d0802cb275a 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -5,7 +5,6 @@ description: Count of updates to existing Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index f80d80ff42e..58264a8f56b 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -5,7 +5,6 @@ description: Count of Static Site Editor views
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index f2fd1b12e1f..ea2505c0d4c 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -5,7 +5,6 @@ description: Count of commits created from the Static Site Editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 149ff63703d..c1b243d32a0 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of merge requests created via Static Site Editor
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: static_site_editor
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 7fa03fd335e..07347d421d3 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -5,7 +5,6 @@ description: Count of users with the GitPod integration enabled
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 08344a43f39..b7fa05e1a16 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -5,7 +5,6 @@ description: Count of all Snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index 6196e159588..cfafaf5d379 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -6,7 +6,6 @@ description: Count of distinct author_id from snippets
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: snippets
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 1e5938b6eef..a03db1eddef 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -5,7 +5,6 @@ description: Count of unique object pool repositories for fork deduplication
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index abd2e31b8d8..09d3873cb93 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -6,7 +6,6 @@ description: Total Searches for All Basic Search and Advanced Search in self-man
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 9ba086ed271..08c3afc5817 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -6,7 +6,6 @@ description: Total Searches using the navbar for All Basic Search and Advanced S
 product_section: enablement
 product_stage: enablement
 product_group: global_search
-product_category: global_search
 value_type: number
 status: active
 time_frame: all
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 640f5798d87..63dbbc67870 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
@@ -5,7 +5,6 @@ description: Count of issues manually created from the GitLab UI on Sentry error
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: error_tracking
 value_type: number
 status: active
 time_frame: all
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 7bdb4b65b29..f0d5c931d00 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
@@ -5,7 +5,6 @@ description: Count of issues where a user has linked a Zoom meeting
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 6a0d68c289d..b4fd354b86a 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
@@ -6,7 +6,6 @@ description: Count of issues where a user have added AND removed a zoom meeting
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 48782412f7b..8ba4e5d6987 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
@@ -5,7 +5,6 @@ description: Count of issues where a user has embedded a Grafana chart
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 7b46d786a7a..fa3e8a5b7ab 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -5,7 +5,6 @@ description: Count of issues created automatically on alerts from GitLab-Managed
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 6d53e08645e..da68ae832d9 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -5,7 +5,6 @@ description: Count of all issues created from GitLab alerts (bot and non-bot)
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 4517a187ae1..c9dccae903a 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
@@ -5,7 +5,6 @@ description: Count of issues created manually by non-bot users from GitLab alert
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 33726405845..0767efa0a07 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -5,7 +5,6 @@ description: Count of incidents (issues where issue_type=incident)
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 83c77355282..9f7767619cb 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -5,7 +5,6 @@ description: Count of issues created by the alert bot automatically
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 e734fbc6735..14e7c87c780 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -5,7 +5,6 @@ description: Count of all issues with the label=incident
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: removed
 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 ee200720ad1..b179c2808f8 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -5,7 +5,6 @@ description: Counts of Projects that have incident issues, regardless of status.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 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 965b16e77f5..489856768ac 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
@@ -5,7 +5,6 @@ description: Count of projects that have enabled Error tracking via Sentry
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: error_tracking
 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 741a523e113..bfa644092b7 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
@@ -5,7 +5,6 @@ description: Count of projects that have enabled the Alerts service
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: removed
 milestone_removed: '13.12'
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 863f2bc63c3..eef336feb68 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -5,7 +5,6 @@ description: Count of projects with alerts created in given time period
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: alert_management
 value_type: number
 status: active
 time_frame: all
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 4a9ffeb2c2a..3f632bf906a 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
@@ -5,7 +5,6 @@ description: Count of projects with at least 1 enabled integration
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 d684c6dc71c..9309929f1a0 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
@@ -5,7 +5,6 @@ description: Projects where error tracking is enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: error_tracking
 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 7b6ca1dce80..a11bf9453d7 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 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 50b2b6307d9..0ea0d53cf0f 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident from an alert
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index a55600b2b7d..32f91f6faf6 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index d5226578de5..52b59889383 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index 5bfc7ea3069..ed5a2d297fb 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that triggered any kind of import
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index f908af91de7..f7f99d39208 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -6,7 +6,6 @@ description: Distinct count of users that triggered an import using the Group Mi
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index b1b6e20e092..8e2fe7b6b54 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -5,7 +5,6 @@ description: Count of imports using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 5635d3918f4..ec7cebe3eb2 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index ffee62ebbf7..73acc7acf84 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitLab.com
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 72f7a33beb6..3a2f95e8357 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 86f7d15eea5..32843d9760a 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index c37009c4ed5..3e1876c517e 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index a7d80f15686..97a88d928bb 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 9851e1b97eb..0881edf754a 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported by URL
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index a76dc28c9c5..4a6c561eb2b 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using manifst file
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index a563b3d53d1..195f3499088 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index cf33c7f8128..46178bf1ff6 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Jira
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index d51591d0297..fc49f7e4b9c 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from fogbugz
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index 834322726fa..28e770a5d5d 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from phabricator
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index e5ca3cbc7e2..cf1d3c2327f 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -5,7 +5,6 @@ description: Count of (attempted) imports from csv files
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index ed0b3b9d032..b07e42b2c3a 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using Group Import/Export
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index b5b6f0a73b5..fff765ec389 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index 22f46b6bf04..beac0d6acc5 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -5,7 +5,6 @@ description: Total count of all projects imported with import_source NOT NULL
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 76c17b6c81d..b6f189f2908 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Project Import
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 28495cc221a..defb43f9de3 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from GitLab.com
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index db8655eba39..fb434d09013 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from GitHub
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index d2dd844a237..c6132dd7bc3 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Bitbucket Cloud
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 8110fc3e008..3fff679d5c6 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Bitbucket Serve
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index 4a32e8e5ca1..7d727ceab3e 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Gitea
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index f1ea4ca9441..fccc694ba81 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Import by URL
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index 938ba0b48f4..2347510d8d1 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Manifest file
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index 63b8b83f219..a8b10bea3ca 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Ji
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 618b647a931..9914a143603 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Fo
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index 0fa06ea3ab7..76ac173e021 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Ph
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index e700a0dbf8d..9341f5cbb0d 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -6,7 +6,6 @@ description: Distinct count of users that imported issues into projects using CS
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index c7f0f128d83..6d52117d7f0 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported groups using Group Import
 product_section: dev
 product_stage: manage
 product_group: import
-product_category: importers
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 08121468e38..ff3dc3c54d4 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki pages created
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: wiki
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index ffb2ed4227c..05722e59fcd 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki page updates
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: wiki
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 75c2d13d744..4e441376286 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki pages deleted
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: wiki
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index a6f04c56d56..6b015860613 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -5,7 +5,6 @@ description: Number of designs that were created
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index aedfed669a6..320921048fd 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -5,7 +5,6 @@ description: Number of updates to designs
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 0fee24ec9e2..156c1a481e6 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -5,7 +5,6 @@ description: Number of designs that were deleted
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: design_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index e8298cb7fbc..72d5c97ccb1 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -5,7 +5,6 @@ description: Total count of groups as of usage ping snapshot
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: subgroups
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index afa2559310d..1471e2ab302 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -5,7 +5,6 @@ description: Number of keys.
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 068ff246f97..7fa5b29d805 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -5,7 +5,6 @@ description: Number of distinct users who have generated a manage event
 product_section: dev
 product_stage: manage
 product_group: manage
-product_category:
 value_type: number
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344100
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index cacd3061278..1764e203258 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -5,7 +5,6 @@ description: Number of users who are group members.
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: subgroups
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index c34c1cfe264..cc885359d58 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -5,7 +5,6 @@ description: Number of users
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category:
 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 35117f6217d..901e609875c 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -5,7 +5,6 @@ description: Total Grafana integrations attached to projects
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 106ecfa4483..e2b4b35afcd 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: tracing
 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 112e7a493c0..c0b572ba851 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 92b913621e3..787c2d35d47 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 e71461d1a5a..b8836be2107 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 17cf56a6fc4..ff8b929ee49 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: all
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 9dbd83529d6..4da9dcb236f 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 10a149c3ae8..e204dc6941e 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Prometheus
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 ae3909f78a4..a352352fb0d 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 843f75ef12a..af7fb206fe1 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
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 93fffedd2e6..d6bc0b5cd96 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -5,7 +5,6 @@ description: Users creating clusters.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 0148788f635..76497d1a020 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus enabled.
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: removed
 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 c3c840c6228..47ee0e3a144 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 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 62f472da341..7da2a9d12f2 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: tracing
 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 b22402d2a1b..0744fa2e829 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
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 851281b799d..ce210cc0e35 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -5,7 +5,6 @@ description: Count of lfs objects
 product_section: ops
 product_stage: create
 product_group: create
-product_category:
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index f2f7870cfc9..434d9989ed4 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: Projects with package registry enabled
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 647e4dd3183..468b0d9782c 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -5,7 +5,6 @@ description: The total number of packages published to the registry
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 6b6f0e978ae..41ed478156e 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -5,7 +5,6 @@ description: The number of projects with cleanup policy for tags turned off
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index 3c49f82fa6b..f0a1328674a 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy for tags turned on
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index e9eaec20453..ace1a48247c 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 1 tag
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index b6bc610b97a..4f29e00776d 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 5 tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 906382f2e52..0aeeefe6fcf 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 10 tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 2ba5e503c81..23f08c6c538 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 25 tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index faa4bb4ba8f..59cd82e005b 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 50 tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index bc2963db71f..9d0f6ff26d0 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 100 tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 2c6e2745560..cadb36f57d6 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every day
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index 15be6b54bfd..be914ed1132 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 7 days
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 68d54c4ebe0..fc9b10e1f73 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 14 day
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index fe620f1997c..f30f835aea3 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run monthly
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 8b06790d4ac..8ee1f401797 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 3 mont
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index 22c6c6b7833..d126e605ff4 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index e4094c25594..8b7f03d5b68 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 11e7b1ebef5..a94f094c6a1 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 987bffdcef8..f039a69fbd6 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 912e349a206..80f4ecfd6ac 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy with the number of tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index a4cfecc228b..55a42c96bc7 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy with the number of tags
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index ecc9cf97b4d..0f17a55ade8 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -6,7 +6,6 @@ description: Identifies if a user is using an external container registry and wh
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 5862f6b4ca5..d405ed43fe4 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: Projects with package registry enabled
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 894691e7880..ec679b1089f 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -5,7 +5,6 @@ description: Count of Issues created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 80a18c67252..c564f9ea369 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of label lists created on Boards
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: boards
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index abeec87524c..ec220fc4da8 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -5,7 +5,6 @@ description: Count of milestones created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index bd2dc41838f..30b6ae5bc43 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -5,7 +5,6 @@ description: Count of Uploads via Notes and Descriptions
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index b91356054bb..26364489b5a 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -5,7 +5,6 @@ description: Count of Labels
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 8a73c5f93b0..6112421c149 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -5,7 +5,6 @@ description: Count of Notes across all objects that use them
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index e7383e40f9d..ed1b0c2532c 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -5,7 +5,6 @@ description: Count of users creating Issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 5f8a7097ec0..c5f1595f9e3 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -5,7 +5,6 @@ description: Count of users creating Notes on Issues
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 31b315b6e12..0b69061425e 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -5,7 +5,6 @@ description: Count of users creating projects
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: projects
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index c89cd1208c4..be7578a0c6d 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -5,7 +5,6 @@ description: Count of users todos created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index e25512bf85f..9b5ad936dac 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -5,7 +5,6 @@ description: Count creator ids from projects with service desk enabled
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 4d2c933ea59..43b24581052 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -5,7 +5,6 @@ description: Count of service desk issues
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: service_desk
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 54426bd92bf..245719d8e4c 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Distinct count of creator_id from projects with an active Jira inte
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 7ed8f79a5a7..015a7c2bbbe 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Clou
 product_section: dev
 product_stage: manage
 product_group: integration
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 4d34d7917d5..b3f8b6ac307 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Serv
 product_section: dev
 product_stage: manage
 product_group: integration
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 9f491a10552..87a8278c9aa 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -5,7 +5,6 @@ description: Count distinct author ids from epics
 product_section: dev
 product_stage: plan
 product_group: product_planning
-product_category: epics
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 4a8714c16c6..838ba151546 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of users creating label lists on Boards
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: boards
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 2b25ce6a32b..c812959bcce 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -5,7 +5,6 @@ description: Number of feature flag toggles
 product_section: ops
 product_stage: release
 product_group: release
-product_category: feature_flags
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 6d4c41cd95e..24fbbebc4cc 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -5,7 +5,6 @@ description: Count of Boards created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: boards
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 1327d016b9d..0bd0e783c0a 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -5,7 +5,6 @@ description: Count of Projects created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: projects
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 27edfc7527a..98fb0df53a5 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -5,7 +5,6 @@ description: Count of todos created
 product_section: dev
 product_stage: plan
 product_group: project_management
-product_category: issue_tracking
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 4facf658e6a..5812515da44 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -5,7 +5,6 @@ description: Count of Jira imports completed
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: jira_importer
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index fb5a674aff9..9f22ee3ebcc 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -5,7 +5,6 @@ description: Count of Projects that imported Issues from Jira
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: jira_importer
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 6d4265d9ac7..82dacb57b67 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -6,7 +6,6 @@ description: Count of total issues imported via the Jira Importer
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: jira_importer
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index b160392c5ac..1f3a8722606 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of deploy keys
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index b684cf0aa93..1b03273b287 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index 605282e0ae0..a250f9c52aa 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 8985639f927..cf1b6723b36 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -5,7 +5,6 @@ description: Total available and stopped environments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index eaebd12475c..a8bfcf8d001 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -5,7 +5,6 @@ description: A number of environments with name review/*
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index aff67e4e6e5..4b8c047ea9c 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -5,7 +5,6 @@ description: Count of releases
 product_section: ops
 product_stage: release
 product_group: release
-product_category: release_orchestration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 51650d645e8..ec186c3910f 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -5,7 +5,6 @@ description: Unique users triggering deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 670c7fb65cc..6e69a80cb7e 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index b86e467b2d3..49a75057fe2 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -5,7 +5,6 @@ description: Unique users creating release tags
 product_section: ops
 product_stage: release
 product_group: release
-product_category: release_orchestration
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 003d5e8ef6f..31ab9308ac1 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
 product_section: ops
 product_stage: release
 product_group: release
-product_category: continuous_delivery
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index b6c7ef41b34..679e0029bee 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -5,7 +5,6 @@ description: Total GitLab Pages domains
 product_section: ops
 product_stage: create
 product_group: editor
-product_category: pages
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 37128c7aa0a..8e5acdf5ce3 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -5,7 +5,7 @@ description: Count of users creating managed clusters with Runner enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 3f9b8ded5ce..0c8103284a3 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -5,7 +5,6 @@ description: Count of total remote mirrors. Includes both push and pull mirrors
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 6de9b8476d4..009097245ef 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -5,7 +5,6 @@ description: Count of total unique commit comments. Does not include MR diff com
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 3e4ef3ec76c..900ea7feaef 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -5,7 +5,6 @@ description: Count of total Git push operations
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 347b487c999..a701bf5b71d 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating deploy keys.
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 66d0c070b1c..09121d5586a 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating regular keys.
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index ca48d4f4251..b895c2af2ba 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Total count of projects that do not allow overriding approvers on d
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index dbbb491e3f0..d2a883e63ae 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of total projects that do not disable overriding approvers pe
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index df9dd1e03f9..a28794c3ea8 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -5,7 +5,6 @@ description: Count of users creating projects with remote mirrors.
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 1bc3b8ba43a..3f64043fc5d 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -5,7 +5,6 @@ description: Count of branches that have been protected and are not the default
 product_section: dev
 product_stage: create
 product_group: source_code
-product_category: source_code_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 3d057ff95bc..46e6776597c 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index be03cd7e5e2..c61b8e698e8 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index 4fba91477b6..965a797a426 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index f5d70fb8260..1b9f5ac9943 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 0bd995daf6f..863a80f8c29 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 09bcd9912f6..6b38dfb129b 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Datadog
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 772ef421072..0cbfb6f0976 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 07366301514..180ab4b61b4 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 0e11cba9c6e..0b4bd1d8bbd 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 5e07ff74113..3c85cba0764 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 4704daf9813..da399896087 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index e5c80d2c1d1..4d6be9b294a 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for EWM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index cd958106cbc..b2ca56dae60 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 0db2c32ba7a..d9cd14d9603 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index 279fd3cc10d..3a9afd94991 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 15347e16178..1067c8b781a 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for  Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 6b1a9ed0089..c1498b0afd4 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 314e0e23397..f8fb07787c3 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mock CI
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index df1a5def60d..375afffabb6 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mock Monitoring
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index 1e891cd7307..e363a531363 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mock Monitoring
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 4254f5ffd44..fdd9cedf0bf 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mock Monitoring
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index e2504a98c71..2bd63d7909e 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for  Mock Monitoring
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 6a39fcb9fa1..f3e55e49f18 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mock Monitorin
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index 7a3fe6993d8..c4798be2f30 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mock Monitoring
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index 2db1ff225d8..5b23018a7a6 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 81b381e7337..56a0dd08f4d 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index 27e2b6ce535..6ebab3064f6 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index 90f0a59f58b..f725f16a442 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index be07d3a67c8..68eff4f7a62 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index deb3e1b4d0f..632c1874cb4 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index 1a208c53f81..682ec3917ff 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index db4e4f63fff..71b6eb6df2d 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index 29b93b42dfb..a1a4a856bce 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index e95a140aec9..8007bab48ed 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index f416d00ab4b..66b1f186498 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index c71e5d608cf..fde9ada1a4c 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index c5e999ae8f6..7530a75d0ea 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 7c160f02fee..468163b3d44 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a Deploy Token
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index b631d667ff0..f2fc817afb9 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a Guest
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index 3f62b79e9f1..a54de5b8c90 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a logged in user
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index 82584ecd920..a6bd49eeb1c 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 0eca0f41708..dec802df936 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index 1e3577820a4..1fb1ff006da 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 8c0cfd62490..a483f6a2e29 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index bd8b5ec54b7..fb05f47bf7f 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index 0610ac36fab..3b4d4b5c975 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 1dfbdebfdc8..8619c77ede8 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index 7e8891faa7a..a0b49c09ea5 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 7685a116b9f..d7228659269 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index 104576a8f32..460931b3919 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index fe04fafc3c8..36fb5aeebff 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index 5f8ccc277f8..d660058cf73 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 3570e509ce9..e97b213129c 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index 2eddb4af420..db42b30b36e 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index 02f45dad580..825ce7038d7 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index aa459c6db2c..89639cefbcd 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been downloaded from the package regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index a527379fe00..5ad492ef26f 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index 1ad33d0d479..f60f74f132b 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index 69983e77d5f..37c5cd9204b 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index 22c4969ad7d..030a763cc6e 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been published to the package registr
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 051e99a67e4..012254ffc6b 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index 8fa5f2b877c..1858f806817 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index 42b0b0130ad..395db445777 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index d1c7f71e593..1ad2bb81933 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Python packages that have been deleted from the package
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index e47231a30bd..9417bccdc62 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -6,7 +6,6 @@ description: A count of Python packages that have been downloaded from the packa
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index 4edd359cc1e..666714af31a 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Python packages that have been published to the package
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index eef109e87c1..6ff3af56c3d 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been deleted from the package reg
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 76923282a40..f071e1763c0 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been downloaded from the package
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 823c81d37c4..2c21127d1e8 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been published to the package reg
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 278524f6d79..cf56b7d8a86 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -5,7 +5,6 @@ description: Total number of wiki page views
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: wiki
 value_type: number
 status: active
 milestone: "13.3"
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index aa314730665..22ff6084082 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -5,7 +5,6 @@ description: List of unique OmniAuth providers
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: object
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 2265eff7393..ffafdb83bae 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -5,7 +5,6 @@ description: Total count of RubyGems packages delete events
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index 20af7e2a564..5af1d22be86 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -5,7 +5,6 @@ description: Total count of pull RubyGems packages events
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '13.10'
diff --git a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index 6c7150b3f44..e189dee8522 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -5,7 +5,6 @@ description: Total count of push RubyGems packages events
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 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 df47faec027..eead64bd627 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
@@ -5,7 +5,6 @@ description: Histogram (buckets 1 to 100) of projects with at least 1 enabled in
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: incident_management
 value_type: object
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index 2dd4576a0fc..ebafea2c32f 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -5,7 +5,6 @@ description: Total count of Terraform Module packages delete events
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
index 21b36947f1a..5ba806efdf7 100644
--- a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -5,7 +5,6 @@ description: Total count of pull Terraform Module packages events
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index bd7a26f022b..2e5028b8e42 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -5,7 +5,6 @@ description: Total count of push Terraform Module packages events
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: infrastructure_as_code
 value_type: number
 status: active
 milestone: '13.11'
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index e07dc348c67..fac597f7a9f 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -6,7 +6,6 @@ description: Total active Shared (Instance) Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index 4b578cecb9d..ddbeeaf9ce1 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -6,7 +6,6 @@ description: Total active Group Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index 2e21fdc511e..fe3a070d689 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -6,7 +6,6 @@ description: Total active Specific (Project) Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 455c3e39d4d..4896ddd4699 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -6,7 +6,6 @@ description: Total online Runners of all types
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 6a7f1f7c776..82cf9083fe2 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -6,7 +6,6 @@ description: Total active and online Shared (Instance) Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 2c604235f36..2f954dab596 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -6,7 +6,6 @@ description: Total active and online Group Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index aaedfeaf477..de771a4a264 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -6,7 +6,6 @@ description: Total active and online Specific (Project) Runners
 product_section: ops
 product_stage: verify
 product_group: pipeline_execution
-product_category: continuous_integration
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index fcb2be99fab..b1d5688c9a5 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes API proxy requests
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index b8362fb9d71..022b7b83528 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index b93fe4f735e..14a2b4915c0 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index b6b3fbb3c49..69c0890cb11 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index 4c457b33db3..c084777ed3d 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index b0611253f8f..064e9ccf999 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 150e8ba7f3a..a408cf82092 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index d52c4b0066c..df84273fe83 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 6deabd1edda..e3930f3120b 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index 6d0d53c94d4..c7a85350425 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index dd412d2cb96..7574fc98775 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index f076b40f403..c1e5b418d90 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 1eea75bb65f..a292d93b12b 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index 216997d9710..8b9324d0631 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 4a8cbd28827..2753e697b56 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify trial's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index faaf52e4edd..bfb2b178139 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index 87b8a1322d5..82cf36fa2cf 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the trial track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 0a1c9d7018e..ab0b4acbfab 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index 10d03b730d0..a01f04cd37f 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the trial track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 572547424c7..def1d3c062d 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index aeaced8c4f2..9821d80ab93 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index 3e8fead4c32..9211bd3ebb1 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 8445229f781..a0571fbb3f7 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's second email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index d8f4beb30c1..ff2430a5f49 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index b6ff4c4ad85..71d7e51c31a 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's third email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index cfd3581c337..d3462f48afb 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -5,7 +5,6 @@ description: Number of projects imported
 product_section: dev
 product_stage: manage
 product_group: import
-product_category:
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index f2bbac01b47..c03bd01e218 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -5,7 +5,6 @@ description: Total count of pull Helm packages events
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.0"
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index 720b0dde650..13c9d9ea3ff 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the experience track's first email
 product_section: 'TBD'
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: removed
 milestone: "13.12"
diff --git a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
index 5be5a703ad4..49d3401ab69 100644
--- a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
+++ b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
@@ -4,7 +4,6 @@ description: The total count of Helm packages that have been published.
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index 9924df439b0..fcb565db67b 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet symbol packages that have been downloaded from the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
index ecff5ad53e0..e3321108c3d 100644
--- a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet symbol packages that have been uploaded to the pac
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index e7f3491aa09..dc40f24ac72 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled from the package r
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index 6aaf9bc2978..7d0f196e242 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with a deploy toke
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index 936e245c240..487aae4b3c0 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with by a guest fr
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 373c23a4016..cf0bf021c05 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with by an authent
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index e1c08134dec..e993de870f8 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed to the package reg
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index 2cdfc6f86d0..af44b3218d6 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed with a deploy toke
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 69db39047c7..674d7817daf 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed by a guest to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index d7fd850a24f..cc3887eeeff 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed by an authenticate
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index a935f1e5829..48461dab515 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
@@ -5,7 +5,6 @@ performance_indicator_type: []
 product_section: ops
 product_stage: release
 product_group: 'release'
-product_category: Release Orchestration
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
index 54deaba0406..abf5e62fdc9 100644
--- a/config/metrics/counts_all/20210723075525_diff_searches.yml
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -5,7 +5,6 @@ description: Total count of merge request diff searches
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: '14.2'
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 4c8659e9f95..7216ad9dc11 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the team_short track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index 9f18e78c443..bc7948d5702 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the team_short track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index 57f1fcc6694..a189aa0fce9 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the trial_short track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index dc18b08081f..0d69622c3d5 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the trial_short track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index a991d9362d1..d4768092e6f 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the admin_verify track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index 0ecf55cc5fc..af423588b9a 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the admin_verify track's first email
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 milestone: "14.2"
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index 2071f97b37e..cc17e370b4c 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active Zentao integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index 5708b9f678e..02752c70d85 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active Zentao integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
index 1fed38ede89..d5bdd07ea46 100644
--- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of instances with active Zentao integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 81408dc5e1c..d84151a8ded 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of projects that inherit active Zentao integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index 55fcd877e8c..46f11dbec22 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of groups that inherit active Zentao integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index c183edf1836..e61552038a2 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -5,7 +5,6 @@ description: Number of unique user logins using two factor authentication for av
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
index bd00db71abb..9d7fea181a0 100644
--- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
+++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index b8b238e28fe..e374f970901 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count groups with active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
index 7e696485c9b..f8ad5d4c793 100644
--- a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count projects with active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
index 3730c21bd59..16043ec6137 100644
--- a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count instances with active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index fd4a833b2b3..296e218d7b6 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -5,7 +5,7 @@ description: Total clusters with Clusters::Integrations::Prometheus enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index 72183cdf8ac..0e8b04ad660 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -5,7 +5,7 @@ description: Total clusters with Clusters::Integrations::ElasticStack enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
 value_type: number
 status: removed
 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 47928eee9cb..11623fa361a 100644
--- a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus integration enabled in last
 product_section: ops
 product_stage: monitor
 product_group: monitor
-product_category: metrics
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
index 904cf384072..48aa9b15864 100644
--- a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count groups inheriting active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 5b4843c2fd0..8b95c0df21a 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count projects inheriting active slack application
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 9256e3114e7..b641f342f1e 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active Shimo integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index 215c300a418..6f97ff718f6 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active Shimo integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index f2d18212671..6a976b62517 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of instances with active Shimo integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index cb433b10c0e..039afc60009 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects that inherit active Shimo integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index 0dc13607603..093d22825a9 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups that inherit active Shimo integrations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "14.5"
diff --git a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
index e2d617dba16..0320f29ca14 100644
--- a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
+++ b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
@@ -5,7 +5,6 @@ description: Count of Live Preview tab successful initializations in the Web IDE
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: web_ide
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
index 5a330eea78b..fbc44bd2a04 100644
--- a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -6,7 +6,6 @@ name: service_usage_data_download_payload_click
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
index 7e84ebefc86..9130545796f 100644
--- a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Harbor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 344a07e006d..888b3bbd8a0 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Harbor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
index d6f76a1c31a..9db7ccd965d 100644
--- a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Harbor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
index d3c6e214eb8..49d9d55869f 100644
--- a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Harbor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
index c61c58da4c9..89fa880f6ad 100644
--- a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Harbor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index e84cad9b9a9..d1842bc9705 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was viewed
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index 92c5605f5fa..f9c11f9efee 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension Full Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index 6501152e564..f141e13bf3e 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index 4be50d63e30..92c20a55418 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index d5e36376b4a..e520852923b 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index fbb2684fa11..cb95d09eeb7 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index 235b5ed838a..d9ce82794eb 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was viewed
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index 25f62dd0184..a3c60c34b90 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension Full Repor
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index a747a6252e9..9e126525b11 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index 9d1b51a2bce..c6412c94640 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 3d98561d8eb..7c557f33ca4 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index b3312480433..b83c7ddfc6f 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index 918ff9b362c..e540343a175 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was viewed
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 1fb7bbc070b..8e4bd3e3d05 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension Full Report
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 65315c78f2b..2f1e2d13256 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index a32d388e58d..be88831a42e 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index 7287000128e..03a85a76b0f 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 1e4d668ba98..57e70d7e77e 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index 4f3c66162c3..33ff93179dc 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was viewed (re
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index f98b80e3741..a025b62a020 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension Full Report bu
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index 9d4d25d5514..f76c3ddccf5 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index 92f9e149377..32a07704948 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index aaece878b05..7c72de195d8 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 1a382cc30ac..152516ff8c7 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
index 07a630424df..df546f533b7 100644
--- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pumble
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
index 2d79df7b275..b4df1200234 100644
--- a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pumble
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
index 457e6d7e861..e237ea87ea4 100644
--- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pumble
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
index 560593744d1..f90acd3755f 100644
--- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pumble
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
index 182a76e98f8..998f821823d 100644
--- a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pumble
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 39d1bea3536..96c97d75c3b 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was v
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 1258a40add0..15de79082dd 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension Full
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index 07a8ac69ae1..511470a624c 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index 2785964ed25..e111fe6652f 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index eabef1927c6..86446bb4364 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 39d252fa1b3..5afb1f5135d 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index 623e0dbb7a4..32cccc5ddcf 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -4,7 +4,6 @@ description: Number of unique user logins
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
index e45b9092147..abe95c49c1b 100644
--- a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
+++ b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of RPM packages that have been downloaded
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
index f41f98d5052..fa4d9435345 100644
--- a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
+++ b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
@@ -5,7 +5,6 @@ description: A count of RPM packages that have been published
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package_registry
 value_type: number
 status: active
 milestone: '15.6'
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
index a89ceecbe0e..627d16438ea 100644
--- a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -4,7 +4,6 @@ description: Count active Jira Cloud direct installations
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
index 6b05ad8c250..e22a0d34044 100644
--- a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -4,7 +4,6 @@ description: Count active Jira Cloud installations that are using GitLab as a pr
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
index 4c17bd746b3..707ea3420fe 100644
--- a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
+++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was vie
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
index 60b6b75d064..7379f0e233c 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
index f5fef7e7cbe..442d7f04f2d 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension Full Re
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
index fa0b573be84..2c065118d8e 100644
--- a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
+++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
index 20e21862a9a..f9de1ef3fa1 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
index 7a917d85b9c..b4d5a765a08 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
 product_section: dev
 product_stage: create
 product_group: code_review
-product_category: code_review
 value_type: number
 status: active
 milestone: "15.7"
diff --git a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
index 5e00246a15c..b63357507ed 100644
--- a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active projects inheriting integrations for Apple App Stor
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
index 9099752c62c..055e7748e0d 100644
--- a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Apple App Store
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
index 92e9acbcca0..52fb49f5b99 100644
--- a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of projects with active integrations for Apple App Store
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
index f7835a4e072..9e7effebb60 100644
--- a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Apple App Store
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
index 436f869cf0d..afbcd40d291 100644
--- a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of instances with active integrations for Apple App Store
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
index 3bfa27fa8ed..e80fe7cf169 100644
--- a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
+++ b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
@@ -4,7 +4,6 @@ description: The number of projects with Monitor turned on.
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: incident_management
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
index aec9e18006e..dd76ea9c36a 100644
--- a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of created Ml Candidates
 product_section: dev
 product_stage: create
 product_group: mlops
-product_category: MLOps
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
index 52c076cf072..8786c7fc031 100644
--- a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
@@ -4,7 +4,6 @@ description: Count of created Ml Experiments
 product_section: dev
 product_stage: create
 product_group: mlops
-product_category: MLOps
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
index 77b0fef30c4..6a4fd0b7c53 100644
--- a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of unique projects that contain at least one Ml Candidate
 product_section: dev
 product_stage: create
 product_group: mlops
-product_category: MLOps
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
index 7cb86824e35..a12b3be4a29 100644
--- a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of unique users that have created at least one Ml Candidate
 product_section: dev
 product_stage: create
 product_group: mlops
-product_category: MLOps
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
index fed72a30697..f1f6f6c594e 100644
--- a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
@@ -4,7 +4,6 @@ description: Count of unique projects that contain at least one Ml Experiment
 product_section: dev
 product_stage: create
 product_group: mlops
-product_category: MLOps
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
index 53b8c280db4..26873a8001c 100644
--- a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
@@ -4,7 +4,6 @@ description: Count of active integrations with Jira Software with server deploym
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
index 093afb71275..7d49a7223ba 100644
--- a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
@@ -4,7 +4,6 @@ description: Count of active integrations with Jira Software with cloud deployme
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
index 9a24543390a..23058f2f6f7 100644
--- a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
+++ b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
@@ -4,7 +4,6 @@ description: Count of active projects inheriting integrations for Google Play
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
index 712a9b9cac1..dff05e0132c 100644
--- a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
+++ b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
@@ -4,7 +4,6 @@ description: Count of projects with active integrations for Google Play
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
index 00f99ed13f4..ae5a38597c1 100644
--- a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
@@ -4,7 +4,6 @@ description: Count of instances with active integrations for Google Play
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
index 1dad27560b6..015e0941ffe 100644
--- a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Google Play
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
index fe83398f9ec..cafd77f9416 100644
--- a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Google Play
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
index 294c044affb..f21ca8ade83 100644
--- a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Squash TM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
index 0ccadb78bf0..859b381493a 100644
--- a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
@@ -4,7 +4,6 @@ description: Count of groups with active integrations for Squash TM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
index 9f35216ddaf..ec88fbb94c0 100644
--- a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
@@ -4,7 +4,6 @@ description: Count of instance-level integrations for Squash TM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
index 25944bfe05a..079d73e70fe 100644
--- a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
@@ -4,7 +4,6 @@ description: Count of active projects inheriting integrations for Squash TM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
index fedc0a801ba..c349bf05dae 100644
--- a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
@@ -4,7 +4,6 @@ description: Count of projects with active integrations for Squash TM
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
index 1c1d126e458..0cb1ceb8595 100644
--- a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
+++ b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
@@ -5,7 +5,6 @@ description: A count of manifests that have been deleted
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index c9d98a96727..d37d8b0e3ea 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -5,7 +5,6 @@ description: When the Usage Ping computation was started
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: string
 status: active
 milestone: "8.10"
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index f864c2be37a..2b08e8667c9 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -4,7 +4,6 @@ description: GitLab instance unique identifier
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: string
 status: active
 milestone: "9.1"
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index f545ae0c061..891ce0c20ff 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -4,7 +4,6 @@ description: Host name of GitLab instance
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index 037ac7b5a03..c0cbdfa8df3 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -4,7 +4,6 @@ description: The number of active users existing in the instance. This is named
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: number
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 77cfcc38204..8c7bfeb5903 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -5,7 +5,6 @@ description: Version of Gitaly
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 35fdc4676fe..e98e258e37d 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -5,7 +5,6 @@ description: The version number of GitLab Pages
 product_section: ops
 product_stage: create
 product_group: editor
-product_category: pages
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 54728ff8206..28a9adf9071 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -5,7 +5,6 @@ description: When the core features were computed
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: string
 status: active
 milestone: "13.0"
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index 3eb94445513..bd1c91597d0 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -5,7 +5,6 @@ description: Version of GitLab instance
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: collection
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index 9c3abd0131f..70ed48b2149 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -5,7 +5,6 @@ description: The installation method used to install GitLab (Omnibus, Helm, etc)
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: collection
 value_type: string
 status: active
 milestone: "11.0"
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 36920d7c895..d4f3bedaa6e 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -5,7 +5,6 @@ description: Identifies the version of the external registry being used
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 3303d8fbdef..e896ce12687 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -5,7 +5,6 @@ description: Information about Git version
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: ''
 value_type: object
 value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
 status: active
diff --git a/config/metrics/license/20230314161014_gitlab_dedicated.yml b/config/metrics/license/20230314161014_gitlab_dedicated.yml
index 0495277077f..1aff67f2561 100644
--- a/config/metrics/license/20230314161014_gitlab_dedicated.yml
+++ b/config/metrics/license/20230314161014_gitlab_dedicated.yml
@@ -4,7 +4,6 @@ description: Is the instance a Gitlab Dedicated instance
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: boolean
 status: active
 milestone: "15.10"
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index f4594dcc2d2..d3afc779e14 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -43,12 +43,6 @@
       "type": "string",
       "pattern": "^$|^([a-z]+_)*[a-z]+$"
     },
-    "product_category": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "value_type": {
       "type": "string",
       "enum": [
@@ -199,4 +193,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 335f8eb15ac..2cfc5567cd9 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -7,7 +7,6 @@ description: This metric only returns a value of PostgreSQL in supported version
 product_section: enablement
 product_stage: enablement
 product_group: enablement_distribution
-product_category: collection
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index a5406c43c4b..df53d2784d2 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -5,7 +5,6 @@ description: Whether auto DevOps is enabled
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category: auto_devops
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index de5f181216b..f7ef96f196d 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects where the container registry is enabled
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 3ed4fa06c05..0d3382cfe5a 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects where the dependency proxy is enabled
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 8c92609ca26..fa645922f92 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -5,7 +5,6 @@ description: Whether shared runners is enabled
 product_section: ops
 product_stage: verify
 product_group: runner
-product_category: runner
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index ec7495cfbe5..932151ca37a 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -5,7 +5,6 @@ description: Whether gravatar is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: users
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index d25cb1d2628..3a5d6335693 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -5,7 +5,6 @@ description: Whether LDAP is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index fb4608c12c5..6c8b0635471 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Mattermost is enabled
 product_section: dev
 product_stage: manage
 product_group: integrations
-product_category: integrations
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 0939ce43903..810ded396ca 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -5,7 +5,6 @@ description: Whether OmniAuth is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index b003b2d8c19..a68569d728e 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -5,7 +5,6 @@ description: Whether incoming email is setup
 product_section: dev
 product_stage: plan
 product_group: certify
-product_category: collection
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 9371a08613d..0fc1e768de1 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -5,7 +5,6 @@ description: Whether public signup is enabled
 product_section: dev
 product_stage: manage
 product_group: authentication_and_authorization
-product_category: system_access
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index ba19088442f..da6055ae7cc 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Web IDE clientside preview is enabled
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: collection
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 104f991e96f..c80a6c88073 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Grafana is enabled
 product_section: ops
 product_stage: monitor
 product_group: respond
-product_category: collection
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 76a1401ae2e..a3b341b2f14 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -5,7 +5,6 @@ description: Whether GitLab Pages is enabled
 product_section: ops
 product_stage: create
 product_group: editor
-product_category: collection
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index 8d126e75ac0..a21165f6490 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -5,7 +5,6 @@ description: The value of the SMTP server that is used
 product_section: growth
 product_stage: growth
 product_group: activation
-product_category: onboarding
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 7653505a19f..9f136ba3cc1 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is enabled within Ingress
 product_section: sec
 product_stage: protect_stage_was_removed
 product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
 value_type: boolean
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index a8d363796ed..aa397254ed0 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -5,7 +5,6 @@ description: Edition of GitLab such as EE or CE
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: collection
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index b1eee864e24..b5880566d5e 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -5,7 +5,6 @@ description: Is encrypted LDAP secrets configured?
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: global_search
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 493c93d3d1a..5e77d547a80 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -5,7 +5,6 @@ description: The version of the PostgreSQL database.
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: collection
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index fc12cc8803f..0510f56cf0a 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Gitpod is enabled in the instance
 product_section: dev
 product_stage: create
 product_group: editor
-product_category: integrations
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index a52473734eb..c648ea6d3e7 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 68a466ebf0a..7ac3b166340 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 242add8c15b..b73e74478ea 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index 22f7e5e078d..f29588703fc 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Artifac
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index bdb58fff347..ae449f4ce41 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index f712d4fd306..61df7c0a793 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 128418f4bd3..d506f8bd727 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index e1865f244e9..d246768a52a 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for External Di
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 21536e35303..fddcce4691b 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -6,7 +6,6 @@ description: Whether Background Upload for Object Storage is enabled for Externa
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index c6d09c82480..615badfd761 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index a4fca5e347b..0da06a20e36 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 05c390c0040..b76c51857cf 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 8cdfd1844b8..2aec5df1117 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index df93b11c656..fb92b12d608 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index 40a39acc8fd..c9fe9bf9e2a 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for LFS
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 3e3f1ec17dc..f4296a1d4eb 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 7e35d718dd3..41b35c32ab8 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index 53f3e2a7022..f891271bdbe 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 32871d5d30e..2ed457f4262 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index ba3f68dab4d..4572ab0330d 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 7c91a7cbe5b..f7ed9d04862 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index ae465ef80b3..aaeb66f10c2 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 8628e5aeda9..0463c0726c7 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 186e7c8b2b9..5c9afd5a281 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Package
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 88fd70061db..38143e1f4b9 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Packages
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category: memory
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index b0df7200270..6536d06779d 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -5,7 +5,6 @@ description: Filesystem data for Gitaly installations
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: string
 status: active
 time_frame: all
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index a466872922e..fdda68c977e 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -5,7 +5,6 @@ description: TBD
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category:
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 5eeb45ea062..e1249aee2a7 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -5,7 +5,6 @@ description: Information about the operating system running GitLab
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: collection
 value_type: string
 status: active
 milestone: "13.10"
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 101c94157eb..3dcb8340628 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -5,7 +5,6 @@ description: Gitaly application performance
 product_section: dev
 product_stage: create
 product_group: gitaly
-product_category: gitaly
 value_type: number
 status: active
 milestone: "13.11"
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index 6cd6e91d2c4..1d25dfed3a9 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -5,7 +5,6 @@ description: Topology data
 product_section: enablement
 product_stage: enablement
 product_group: memory
-product_category:
 value_type: object
 status: active
 milestone: "13.11"
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index 006a77f8b29..e5732e3410b 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -5,7 +5,6 @@ description: List of collected data categories corresponding to instance setting
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: object
 status: active
 milestone: "14.1"
diff --git a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
index d7e1a7f68bf..ec7a2480990 100644
--- a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
+++ b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Service Ping features are enabled
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: collection
 value_type: boolean
 status: active
 milestone: "14.3"
diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml
index 14662665cf7..7c4ae3a4f29 100644
--- a/config/metrics/settings/20211124061450_snowplow_enabled.yml
+++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml
@@ -5,7 +5,6 @@ description: Whether snowplow is enabled for the GitLab instance
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: product intelligence
 value_type: boolean
 status: active
 milestone: "14.6"
diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
index c634facdd92..f1d2b64c531 100644
--- a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
+++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
@@ -5,7 +5,6 @@ description: Metric informs if currently configured Snowplow collector hostname
 product_section: analytics
 product_stage: analytics
 product_group: product_intelligence
-product_category: product intelligence
 value_type: boolean
 status: active
 milestone: "14.6"
diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml
index 01c73de57c0..625afabb029 100644
--- a/config/metrics/settings/20211201012652_flavor.yml
+++ b/config/metrics/settings/20211201012652_flavor.yml
@@ -7,7 +7,6 @@ description: What PostgreSQL flavor is being used. Possible values are
 product_section: enablement
 product_stage: enablement
 product_group: database
-product_category: database
 value_type: string
 status: active
 milestone: "14.6"
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
index f331aab7882..8ec9482b8c7 100644
--- a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -5,7 +5,6 @@ description: "Certificate-based clusters feature flag"
 product_section: ops
 product_stage: configure
 product_group: configure
-product_category:
 value_type: boolean
 status: active
 milestone: "14.9"
diff --git a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
index 0f77cde4014..4a1cacfcfb2 100644
--- a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
+++ b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
@@ -4,7 +4,6 @@ description: Whether Dormant User Deactivation is enabled
 product_section: fulfillment
 product_stage: fulfillment
 product_group: utilization
-product_category: subscription_cost_management
 value_type: boolean
 status: active
 milestone: "15.6"
diff --git a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
index 6cd7e0f0da7..015cffd4032 100644
--- a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
+++ b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
@@ -4,7 +4,6 @@ description: The value of the dormant users period being used
 product_section: fulfillment
 product_stage: fulfillment
 product_group: utilization
-product_category: subscription_cost_management
 value_type: boolean
 status: active
 milestone: "15.6"
diff --git a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
index ae73bcbafea..9c633a701c1 100644
--- a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
@@ -4,7 +4,6 @@ description: Are encrypted incoming email secrets configured?
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: build
 value_type: boolean
 status: active
 milestone: "15.9"
diff --git a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
index 227bc86adfa..8b22c398861 100644
--- a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
@@ -4,7 +4,6 @@ description: Are service desk email secrets configured?
 product_section: enablement
 product_stage: enablement
 product_group: distribution
-product_category: build
 value_type: boolean
 status: active
 milestone: "15.9"
diff --git a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
index 5076eb9cdd8..08016b5143e 100644
--- a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
+++ b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
@@ -5,7 +5,6 @@ description: "List the index inconsistencies in the database"
 product_section: enablement
 product_stage: enablement
 product_group: database
-product_category: database
 value_type: object
 status: active
 milestone: "15.10"
diff --git a/config/metrics/settings/20230328165533_mode.yml b/config/metrics/settings/20230328165533_mode.yml
new file mode 100644
index 00000000000..bc8019d86aa
--- /dev/null
+++ b/config/metrics/settings/20230328165533_mode.yml
@@ -0,0 +1,23 @@
+---
+key_path: database.mode
+description: What PostgreSQL database mode is used. Possible values are
+  "single-database", "single-database-ci-connection", or "multiple-databases"
+product_section: enablement
+product_stage: enablement
+product_group: database
+product_category: database
+value_type: string
+status: active
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115900
+time_frame: none
+instrumentation_class: DatabaseMode
+data_source: system
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate