diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 5b28ea0e07610866d7ee95012b5dd5db5cf1e0f1..1b9898c4150d366b127f085fa344b357706c26cc 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -4,7 +4,7 @@ key_path: gitaly.servers
 description: Total Gitalty Servers
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 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 1193654a75f7f2f8c07167c3180c0c01ca4f0e26..6e8ca9adcdadc3b9e32f31e5b577c73734f70128 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -4,7 +4,7 @@ key_path: gitaly.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 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 a03db1eddef5e86fa73e04d0c180a91909e691ab..2de48dc5b7325e4d217587c7ce950e5868a23371 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -4,7 +4,7 @@ key_path: counts.pool_repositories
 description: Count of unique object pool repositories for fork deduplication
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 61bd52e1ce6e13da6bb391651cb0d1337be37f2c..0ef40b36d04297c9eb69aef4dab7c35a211efe0b 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -4,7 +4,7 @@ key_path: gitaly.version
 description: Version of Gitaly
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 6536d06779d385c1118659dda8a7817f3d362569..d8e8a6175071e6a6291c8ed3b1ca899f0b64b8cb 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -4,7 +4,7 @@ key_path: gitaly.filesystems
 description: Filesystem data for Gitaly installations
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 value_type: string
 status: active
 time_frame: all
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index b7c5ebec4a993414157b08bfbd79101647fa61e2..ddb1be87dfd3f6a35d4fb6ba58d2ce9d1086f1c1 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -4,7 +4,7 @@ key_path: settings.gitaly_apdex
 description: Gitaly application performance
 product_section: dev
 product_stage: create
-product_group: gitaly
+product_group: gitaly_cluster
 value_type: number
 status: active
 milestone: "13.11"