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 abfb3d38e6fbdc972e430dbc1d02b8acf9ffeacf..de91c766aa3a553f5d9506a90964573acefbed43 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
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
   template in last 7 days.
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 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 848a2c4783f0b45fbc4ab315f060c29b0433938e..54cd9f6aeba43509920528ca387713149be5ef6b 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
@@ -5,7 +5,7 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
   7 days.
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 time_frame: 7d
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 cfbdc82454b41bb8f251f7f73a12ea13d5fc7678..496dbb2935257098748c97b5b89262bb656f8be2 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_weekly
 description: ''
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: '14.5'
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 ed7edc8d121f5901b8d5cc2f4997545757571c39..ad4e5fc8b3f75f0b3e074b293cc64b140c08425a 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_weekly
 description: Weekly counts of times users have executed deployment jobs
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "14.8"
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 9229a487402e2f966e3a9a134a9eb7316a00331b..a94edf2d48da246a9c89e7a5d9af89e9b5ab454d 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_verify_environment_job_
 description: Weekly counts of times users have executed verify jobs
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "15.2"
diff --git a/ee/config/metrics/counts_28d/20220407183012_count_distinct_user_id_from_deployment_approvals.yml b/ee/config/metrics/counts_28d/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
index a0147c61ebd14caae8581861ba078c0dca44d735..6ef5defc8afbbb9ce3cc99084f631ad3b8f22997 100644
--- a/ee/config/metrics/counts_28d/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
+++ b/ee/config/metrics/counts_28d/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage_monthly.release.users_creating_deployment_appr
 description: Users who have used the deployment approvals feature by month
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/ee/config/metrics/counts_all/20211007133842_releases_with_group_milestones.yml b/ee/config/metrics/counts_all/20211007133842_releases_with_group_milestones.yml
index afdb23cb0e751b6148246ebb96f9747ba2058907..b7bc1db0d891a6556308cd5a62197cd8726b3825 100644
--- a/ee/config/metrics/counts_all/20211007133842_releases_with_group_milestones.yml
+++ b/ee/config/metrics/counts_all/20211007133842_releases_with_group_milestones.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage.release.releases_with_group_milestones
 description: Unique users creating releases with group milestones associated
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/ee/config/metrics/counts_all/20220407183012_count_distinct_user_id_from_deployment_approvals.yml b/ee/config/metrics/counts_all/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
index e2f639b63fc871a7adfdfa607af33d77eeb4999a..16df5dd37bbaf47e55e25b447f35428959c0d5c0 100644
--- a/ee/config/metrics/counts_all/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
+++ b/ee/config/metrics/counts_all/20220407183012_count_distinct_user_id_from_deployment_approvals.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage.release.users_creating_deployment_approvals
 description: Users who have used the deployment approvals feature by all time
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/ee/config/metrics/counts_all/20220520175711_deployment_approvals.yml b/ee/config/metrics/counts_all/20220520175711_deployment_approvals.yml
index 9620bff7df735ad730c82e0635cb4bcad917421e..5730fda0a8c421f81be17d534eefa3ff1ab633e2 100644
--- a/ee/config/metrics/counts_all/20220520175711_deployment_approvals.yml
+++ b/ee/config/metrics/counts_all/20220520175711_deployment_approvals.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage.release.deployment_approvals
 description: Count of deployment approvals
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "15.1"
diff --git a/ee/config/metrics/counts_all/20220603133830_environments_approval_required.yml b/ee/config/metrics/counts_all/20220603133830_environments_approval_required.yml
index a00700a5d68199adfacfe9a57237faf4a7202ae6..5814086e8abd953cd34e105d8339e1ce0946cb3d 100644
--- a/ee/config/metrics/counts_all/20220603133830_environments_approval_required.yml
+++ b/ee/config/metrics/counts_all/20220603133830_environments_approval_required.yml
@@ -3,7 +3,7 @@ key_path: usage_activity_by_stage.release.environments_approval_required
 description: Protected environments that require approval with approval rules
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "15.1"