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 6647ed6e3b80b92e5516c86084b7de37a9663fb2..7bdef827c22c0d70144ffae5f793f8cfd68190b8 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_m
 description: Count user ids from GitLab Managed clusters with Cert Manager 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_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index 249e7d85bad05b3acf6e79f8cad1e8ee8e64bc86..83bc9e26503e5c9879e2ffc40d5b7382479b0884 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm
 description: Count user ids from GitLab Managed clusters with 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_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 7a95f6e5ac704f547d03db5ff9ea46d695e828f5..837a8affd4d0fa8893e83718074463583c7b1657 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingres
 description: Count user ids from GitLab Managed clusters with Ingress 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_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 12c8dde9cff00b51b567ddababcd1e73aa64fd02..796259b5ad1859cf1e56695be96929267ce9142d 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knativ
 description: Count user ids from GitLab Managed clusters with Knative 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_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 286c5401068d8faeedbb3547dab78f9e4917260e..b30a8693cd2237c0c298239152aca494f339142d 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -5,7 +5,7 @@ description: Number of Kubernetes clusters with clusters management project bein
   set
 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_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index ca1c2bb72adad2b0cdf70e6f25d82f3c2d6f52be..4b83b246f4828b72e7b7ba54b49a7c336e5f41b9 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_disabled
 description: Number of user ids from 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_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index ec116c7c2ac48ebe0e2f6a22b1389fb51beb406b..b36d9292a578fe13712d1dfd5234164dd7d55077 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_enabled
 description: Number of distict user ids from 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_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index db348e8ffb034660458a8f27e4ae49e8721bea58..9f847d2ebeff0a7d9e35fb26a49ff095c8b611d4 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke
 description: Number of user ids from 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_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index cb1b6b9e9e8cf92a725ce3c8b485e81e557df914..410cf6c8384b615a2eebd7eff52338934857f426 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks
 description: Number of user ids from 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_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 17331ea5882b7dfdea31b90c5828a29d23394d88..8aafee5b4cc126129a7e8fc9a261e4f05c9d8adf 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user
 description: Number of user ids from 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_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index 5f4afa58ac9d82d10f2215d7ca1990a572e4793e..05c6c398bef3a1db1d96e0aeb4d84949190d2982 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled
 description: Number of users from 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_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 6c750370bba6ba6414d38344c2dddf16ad091b95..8b1840bd3638a33465b3a954d65de42ca754a17c 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled
 description: Number of user ids from 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_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 3eb3b05b0bec12c50c121f99fd382dff53164533..29652c974e77b70a36d5e81026575343fdb596b5 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled
 description: Number of user ids 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_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index f7be4ff3e68036a147fd3b06df84c3f9c0a47e6f..7576f17f02b77657bf3915777c6866de0cf02347 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled
 description: Count disctinct user ids from GitLab Managed enabled 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_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index eac8e143217c310597eaf78f6ab894e70fdf2e74..ea56027983606c4b7c9e29864a5276524f20cd2b 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled
 description: Number of user ids from 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_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 6e297a3bb8ede666f7c51b9d8f5d4109ef0cb439..d57155d4f55f6dc64fbd877fca52b516afe95a3b 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled
 description: Number of user ids from 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_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index 723776de6f8b21251ed43427ca9056734ffcebbd..ae437b157724143c9c80fef612650d388bc45914 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
 description: Count of pipelines using the Auto DevOps template
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 6c818d48782c20e50e7d2b25bda17acabe29a4c8..072702d11b721fef0eee436c1ca2c7ccf70a107d 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: counts.group_clusters_enabled
 description: Total GitLab Managed 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/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index c9afefabf6caa8d03cf6fb201e49a70bdda3fb97..bf46651c35e0bb7a24ff2fdc9ddd6d7d9d0cc21e 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -4,7 +4,7 @@ key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously 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/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 9d909701fe8fae0bd1f9c63d797b7f1659cbb4a7..5355e0d20883e137f209df4942eb2502f13aecad 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -4,7 +4,7 @@ key_path: counts.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/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 16c1f26bf8e5206ad6db171b83dfd0a540473fe2..c28027d3ff31cb81535af026153be84f9bcff902 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -4,7 +4,7 @@ key_path: counts.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/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index 9ff2585d09dfb454023b902b7cab0950acc27c7b..a5d4ca79bcb421536af2f82a15615e4f53f248c4 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -4,7 +4,7 @@ key_path: counts.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/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index ee95e2812dc52eea1b37135854149ad69856300b..b9c52cbc53c7cc556c2a00fdf988f7f8fcef63ba 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -4,7 +4,7 @@ key_path: counts.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/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index 3e4a4c6a7af9f833e44a9a9f54e3faf1709deffb..7442529453b59497ebd5e73da4125b38b2f56418 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -4,7 +4,7 @@ key_path: counts.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/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index fb3707aed9aec079ac8dddf1ebc94957d5a6908a..1cf2d803c1f58a8a8b93bdd3fed33165314885f5 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.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/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index 1711589636dc2ffaee3459da14d95525069d5836..c6d758c880745c23987c04c6def1d5e0afbbd158 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.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/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index 263102b5a3b497a96a969d30a4fa8de2810bf987..77e6b3d8672901cad3a69bae6d2784035f31cc32 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_enabled
 description: Total GitLab Managed enabled 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/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index 9b66261f91c5b8512d55338bfa05b416be072552..21f70a13a81e11e53c142f4fb07c3aa3bea734b6 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting 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/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index 0e8b04ad660b869d01350ff70a5766c31b558b58..daaec1ca34fb6c2c7b63427b4e624490d2d4144d 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -4,7 +4,7 @@ key_path: counts.clusters_integrations_elastic_stack
 description: Total clusters with Clusters::Integrations::ElasticStack enabled
 product_section: ops
 product_stage: configure
-product_group: configure
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: removed