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 99cabcd6dc10e5b5e033183946ede428c406dc62..707b063c622678d6fed2467b9021f4b09ce826b0 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly
 description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 time_frame: 7d
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 fa1b01b029e7be41dd9cf348a44237495c6c1ce8..dbdba4992d945b7a4c0de9674adefedebd6b61cd 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_we
 description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 3487a2306a255da967f1db7e9384b44d4d503f47..1de0ffe36cda12d88b56c68d7fb6630fea0c526e 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_bu
 description: Count of pipelines with implicit Auto Build runs
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 07868d1be43a65fe66507b8b52159de6486412ec..8b1d86d81648ce643a2ec54b0f3161a0f42cce46 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de
 description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 422ab92b81eb98f413520096528a84bc20bbf9ef..1788d3c41da44c133b2ac8ec1ef698cdfffdb474 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 855c1365589c1d91dbab5dbe0290dd7ccd2b4967..337f285dbfdb29abdfd9264dc352d5ebb83672af 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_week
 description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 3c3d297639cda6ae0a59126dc68c6e17265bea8c..f6596565e81d2046ad8e5fedebb532b56a527a07 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_late
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
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 332e522c181644b3d79a78e19c7c95794b6c378f..e49e0a8abfa450ef915c2ebd527e67bd27eb5ea6 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_w
 description: Count of pipelines that include the terraform base template from GitLab
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 291d05736cdf2693e1adc18d40b044fb582fe1e2..5710aaaf4b28be253da363d9ad1ef0d1f8a01ce8 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekl
 description: Total count of pipelines runs
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.3'
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 814b6c3352cdbcf5632c9e0c1b1d0ef150cfd046..e392cab76fe920fcdd5f7642c441db8d84c193e3 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_de
 description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 7 days
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 181d38b6fc7552b928eeabefe456127f6fd3c69f..071aaeb82eab79c625f6cbf07cc6091f81ad3c4e 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekl
 description: Number of distinct users creating Terraform Module packages in recent 7 days
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 milestone: '13.11'
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 98951919e65c4849435da365094fc3291a19733c..6154c1f75240ec83f1bc3b1e9f116386ecd974b6 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: removed
 milestone: '14.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 3c309eb1bb5593b5a8ecb9ae506d4842e9b516ab..9988283de8a91e7e64b718d0e5ae16208b482156 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.kubernetes_agent.agent_users_using_ci_tunnel_weekly
 description: WAU of the Agent for Kubernetes CI/CD Tunnel
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 milestone: "15.3"
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 3d2ccd4083af0e60cc799bdacddfde8dc07b4121..4d796f1851889cd3b6054eccbd23396c2a89477c 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_weekly
 description: Count of pipelines using the Terraform Module template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 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 4f307e94be7fd6b0c1e7327033dd499fb2dec04a..fae4695f7108af5a97ae5c82ec1e3903038c3b68 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_base_w
 description: Count of pipelines using the Terraform Module Base template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 2fc86649c4b4a925fb061d3b53f9601617fffeb3..f995d872da7934ddd1779839ad70388f1257b1d7 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_enabled
 description: Number of Kubernetes clusters attached to GitLab currently enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index d6d5228d0fe2a2ff8b5a34fb02d14f377b908bad..b0033f346b4dbfb4c310f6a08785869f6fc626aa 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.project_clusters_enabled
 description: Total GitLab Managed clusters attached to projects
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index 804e25da11c743f5e0965d9f4eb157644486c508..7c7cdc336bdf89837a3c7d80f40e9b3d5d461ad2 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed clusters attached to the instance
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index c4d4f14fc2c764936a4d290f6058f1548b5e32b4..5d1b65ca0d674dadadc3d42ea05eb1e9af8f365e 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_disabled
 description: Number of Kubernetes clusters attached to GitLab currently disabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 8ebcf09d7a26278ad9908f2c66fee4450a6fddfb..ee710fc765cd9be111938065bd936b82918105ef 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to projects
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index 59b42f1cabe2248d92d14587094f4078119b5cb4..64f9ee339e83164cc41666e57f432ef70bc28f03 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to groups
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 6e9c86ea00f84f111a23625b71c91241f3b727e2..0c58015d84d4513df6fc9ab58d62c488e1d45ae8 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index 4c073d618440b327ea2dc312be95f50223d873f6..c1728972b49f9d111a79ff6f40620bd64f91eb2c 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index 885de6e75a0b6386a3d1bf4984b03736e8469372..b88d77df17641f6115bf4f3178d43fc9234dac27 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 63d06eb1af872de5dbb9cbcc42ad197c06f45379..74d6e89470a75b8f9bece2b4b0dbe9ec8cf90c07 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 29df1ab8ff37fb1a363c56819abcc11b385e4108..9463971b6d96047e43aaba5fd4d27a4f05639e8b 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 02ddd07636f5a486f1316318149ccca826b0c8df..052b2a2788d48dea20a8acabdc85965a0cda8131 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_runner
 description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
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 20afc0b4acf2a053e60363b48686947a8d1f6065..3a5bcc702d2c9fc52eb6adab67b3194f007d73e6 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 101167e45d36f2c35f0f9eb1887e6e4a0be90860..4c0b64bf65ca881b54c1ff3c9f6aae4b0bd3f4ad 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index 0deff066abb95431563c2d05fb0b063e731d4c00..62d7d2e5eac97bc455f032820aff5d39a49e1d4a 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
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 90347bb8207410217656a0d73e778b465c16d08b..cfa3ded3ba1219f6b4d188e5ec7e7cd01009a843 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 2a1f18295dfb25df56b9d7835d7d3e9076df3de0..9d0fd879c464a5d4e587680cb3a677d50965704c 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index 4c6f0ce629c7fedcbda2d8b31642d0d1b3c588ff..654e6281f5616a74f39742c3611c263df93e4edc 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index 0a8899be1a3b56035d4415340ab7add6af27645b..171a56fbeb9f4f8c24958babbb0fb9c4eb0e5ecd 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 510b66c02a260d14303094a178c368f9da4fbb35..38e1c1210aad303fe1bf99cad8ed491bef1a0a0d 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_disabled
 description: Total GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index be4ca306effd797f20c3f5d97b0dadf9e0951469..1fb1817dfdf334c932c719a469fb60ee8f191448 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_enabled
 description: Total GitLab Managed clusters currently enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 41a546f73ab7cc6f8aa95fc98777feca3c0bd86a..d937b191582787fa9683569087aa993105ef51d2 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index ed86490ef9c213e89ffa3ee276d02104e738b174..024c2fa08cc136a2a1ecb18526a2f8740479dce1 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 8007b2fc277b4fbf9fc2e10b3cfc2d73b4c3895f..95b1140c4918aa0bb025830dd4551b87d0fdf27a 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index bfe2a41c6ef9c65fb55e54fa8976798b16ee84b7..524fb139a66ecd415da441f8d89d4c9230a614c9 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 92e39a8aa365d0f8d0d7718439d6cfcd46b4b2d0..5a5998503b6635c6279f0b4aed5d3944df6b39d3 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index 741036b7cd37c7504e046a87402388a5f06ac682..f587df3154b48d9802ffb90bbd0fa55a64a6c144 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 7afa52d0aa52b90a5ad524be52f091794d778190..32374878c3610c0c3ea75a64e63728742403fc4a 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 9baa428c72d6b4fc25d94b39e4f6b095e0b3cfbd..5a8d4fe745926dd38c8df683f797bc1547966f68 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.clusters_applications_runner
 description: Count of users creating managed clusters with Runner enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index 296e218d7b6b5dddb2d8e798702f242306402eed..e3e24abbcee293be6ddc5aef811ff046343207ec 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_integrations_prometheus
 description: Total clusters with Clusters::Integrations::Prometheus enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index ccff2e5b4722cd1a28d0021e40ae9feea6d92eed..72f13e22ddfb581a9d15bbb65345a2aae0ff79a6 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -4,7 +4,7 @@ key_path: instance_auto_devops_enabled
 description: Whether auto DevOps is enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
index 8ec9482b8c7ac0dad90167c8e3b48eba2f684fe5..30287bea2756e8e5af832151047e037430fe7523 100644
--- a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -4,7 +4,7 @@ name: "certificate_based_clusters_ff"
 description: "Certificate-based clusters feature flag"
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: boolean
 status: active
 milestone: "14.9"
diff --git a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
index 215f22931346e8ed732869a8b9faea725fec16f1..c5147066ddee25ecdc876d362aa6574843d39499 100644
--- a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
@@ -5,7 +5,7 @@ description: Weekly active users creating pipelines that that have the Vault JWT
   with it.'
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 time_frame: 7d
diff --git a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
index fecc91cc65e48b4fd4b5c8055496c6c37b93cb63..a822a0a250b781e20ed6868c9261edf538720f4e 100644
--- a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_weekl
 description: Count of pipelines using the Auto Build template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
index 9eec9dbd7d532032d508a1efda1032ac909f8b77..930302b833006bdf0dde547089f9bc132606d00c 100644
--- a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
+++ b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
@@ -5,7 +5,7 @@ description: Count of events when an Agent is asked to synchronize the manifests
   its configuration
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active