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 97965f8f7a072368a2fc5eb8cadf71612d09aaf1..bbb26c9c0a05b79e16054580200c035ff050879d 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
@@ -5,7 +5,7 @@ description: A weekly count of Composer packages published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 2abc15afbc13bea081c3292ad189e6152231cc92..61d4c1d5b746b0c930caf2c2dab9d8da5be45b24 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
@@ -5,7 +5,7 @@ description: A weekly count of Conan packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 dbe77d0e88aaaa4d5cfe9233f92cbdfafe40b813..980502a05477c1bdce45f66d7af8a8b43bbcb2e2 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
@@ -5,7 +5,7 @@ description: A weekly count of container images published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 513371a05b4acaf4d5d6d14a90b87d7b2fc144b3..4618e812757c1037423f2a638a11b30fa5ab9046 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
@@ -5,7 +5,7 @@ description: A weekly count of Debian packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 7c0748dd38b85dcf06ff8c446efda4f1ecddded9..cef900814ad69efda6f2e4da0244c63841225928 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
@@ -5,7 +5,7 @@ description: A weekly count of generic packages published to the registry using
   deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 cfe9bf13702ee3d3e5c29b987c61428952f95644..0964a478ff0c0ea4d44b3c6bdea3eb7d8dcf2e10 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
@@ -5,7 +5,7 @@ description: A weekly count of Go modules published to the registry using a depl
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 b2bcc1114417766872da78519cd46b4a0314a98c..8cdc15b5aed1ff22322afacc45508cb259fcc0e9 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
@@ -5,7 +5,7 @@ description: A weekly count of Maven packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 e4fe75251dd87877f0c6c7895549b0fc9580d5ea..94288b02fa65dc0f2e0a0af471edafb017fc54ad 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
@@ -5,7 +5,7 @@ description: A weekly count of npm packages published to the registry using a de
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 48a08d9924c707ccde98d6ec9acf96fcabc16d4b..666eb72d8b146437d2cce0d5bc9b8f0161a8af9c 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
@@ -5,7 +5,7 @@ description: A weekly count of NuGet packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 84cbb71a20c9e01398ab8f0caec1901dd28a70c7..4847b91e1579e9e3766ca9815d9719db359c5961 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
@@ -5,7 +5,7 @@ description: A weekly count of Python packages published to the registry using a
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 10a7c219917a5f259a9c1827e247fbbc4a3a3bb6..1ebaacedb1bb07c2bff572bc8b8732b8a1fcc24f 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
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a package tag to the re
   using a deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 ff92a09009af27ee465c5f4cd7c0f84165d87a59..e0e7ebd62aefcf9572358567a3d976ccde1d33e0 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
@@ -5,7 +5,7 @@ description: A weekly count of unique users who published packages to the regist
   token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 e7972ef2de01c4a2519dbfebfedd711fa0232bd6..96c9e4a725a54974c7a011a94a2eb0c758d0a008 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
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a Composer package to t
   registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 ef942bfa457ab40e1b9cbcccdbc8cedbbcbc6e31..21a4f881f4aba667ad7ed1dbba2e9bfd6663b05f 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_conan_user_weekly
 description: A weekly count of users that have published a Conan package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 74957ee656fbad64b8d13303e4927b5d906ff1b0..87930bb132ab25a90ca3b960e23fe99d4f3dc55a 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
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a container image to th
   registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 6636498e590ae5f013b06cfce737c88874b0fe3e..a6c934bfdd5c882cc54556029e05780f1f63cc58 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_debian_user_weekly
 description: A weekly count of users that have published a Debian package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 34e434123963611779ba1a0435caa56859b333db..c397700ee1ad63e29b25716935de15922f3145ee 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
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a generic package to th
   registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 e44104ebf6c6faafe5645c4bbca61cde1545f6f8..2d4d40a775aee3ec03dbaebdd746d8f48ce78aac 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_golang_user_weekly
 description: A weekly count of users that have published a Go module to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 9b838d2ff368122fdc8844cae7e7d09908fc3124..22dcc1de4277adf51bf2361327db0fb2f2d5c203 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_maven_user_weekly
 description: A weekly count of users that have published a Maven package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 e8c047d80d62b6bd597660f2bb27e1ece123fcd1..11fc69cc7eaa25e722514d9aed18825350ee54ce 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_npm_user_weekly
 description: A weekly count of users that have published an npm package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 900dbcbaa3978b3b4f16d51d9a1afbe4e9988311..211487005743d3487e13f37b727e322d55b4f5a0 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_nuget_user_weekly
 description: A weekly count of users that have published a NuGet package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 36959afc983310bc351cb8d1c1f5eb92c3ce9a20..4143511c20d4760ab8ac197a0a1012382f6823d8 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_pypi_user_weekly
 description: A weekly count of users that have published a Python package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 cec805a07b461d5a0027001fd9b59195bc3b1205..7074b7c081a14c4bf7a478baa2c6162128547587 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
@@ -5,7 +5,7 @@ description: A weekly count of users that have published a package with a tag to
   registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 f22a975b1ae88e2cf1816aff7549157c746ca8e0..e37f6d279194df241be99c1abbc562b15a14ca38 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_wee
 description: A weekly count of users that have published a package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 time_frame: 7d
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 9ef1c5a9fb196651d084346fa5a08bab6b526e38..d845233892a319d9f9f64473eabee35beff3793e 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_tok
 description: A weekly count of distinct RubyGems packages published using a deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 a99033e7a4440e08e4cf8777f538144eed2aa166..7d61c68e8579ea8c31285a09561fe531ed3ec711 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_rubygems_user_weekly
 description: A weekly count of distinct RubyGems packages published by a user
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: '13.10'
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 233d8eee38118166a3ddea70d106d40430eaec0b..838a47c658c06d8f1b76355159c15db007872a9b 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_w
 description: Distinct Helm pakages deployed in recent 7 days
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 296a1a38b3074d96da01a7a0bc07618a993494fb..0a6b7abd689da1da43d8108d8856c5d74ff18982 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_helm_user_weekly
 description: Distinct user count events for Helm packages in recent 7 days
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: "14.0"
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 a1709e345112801d4863187464d85d41bfb2849f..cea3a680768da896e4288584194c72c8c9fbc0d5 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_rpm_user_weekly
 description: A weekly count of users that have published an rpm package to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: '15.6'
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 5d4d15d465fdbf6140574db52748e6c345452c70..9d437ffd3663565724fa26ea52e141333728e55b 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
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_rpm_deploy_token_we
 description: A weekly count of RPM packages published to the registry using a deploy token
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: '15.6'
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 29c19241e6b01d1731a57d8e1b3c8490a6cc3c46..099810b7222280feab461281594ebd44e51940fd 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_push_t
 description: A weekly count of users that have pushed a tag to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 0424c54e4f829cfc97f4702b5f910ee65384e901..4ee562dfa89baa276308e895cd928deb7294c80e 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_delete
 description: A weekly count of users that have deleted a tag from the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 9bf92728540e3c746f574dc4a092d9603941a5db..ac4fa1dc956678b974e794b3b97a8e073ac0084a 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_push_r
 description: A weekly count of users that have pushed a repository to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 a2e34093b664bf1eece0e955c25f0aba2b6da868..f89ce55a562674d4564583a1e0b0d8a6bbe1f590 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_delete
 description: A weekly count of users that have deleted a repository from the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 c4f217ae0688b0af3a1bbb77d26ec12c3bd757d6..f6e61afe97a9b100b389c1b37e0a1325a16635b4 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_create
 description: A weekly count of users that have created a repository from the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
index 5d521a7840a3cb734141cf3f4f51198232fc0982..5f0830360a95735915a7207db956ca3f423d2691 100644
--- a/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
+++ b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.user_container_registry.i_container_registry_writes
 description: A weekly count of unique users that have executed write operations to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index da869a35fa81408c49415ad1d90c077c45cbaf80..c7f7567b8477e140ef93766515f30c3a4045e5fe 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_with_packages
 description: Projects with package registry enabled
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 468b0d9782caa8933914ddceaa5fbd5e490d463c..7afe2c780f967924e58756e00a4fb941d94ee52e 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -4,7 +4,7 @@ key_path: counts.packages
 description: The total number of packages published to the registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 9d0f6ff26d0b11afb022e8b2ea529746969c5cfe..e511f2cce9529be90a9e4e9f072d9d555cb64ae0 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
@@ -4,7 +4,7 @@ key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_100
 description: A count of projects with the cleanup policy set to keep 100 tags
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 0f17a55ade8b5e907d473e07a7925341711ab842..4f3aec560dbe1aa4bcfcc0d341889fe778f4e33e 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -5,7 +5,7 @@ description: Identifies if a user is using an external container registry and wh
   type
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 18c7bae85e24851eca1768128eec9dedef14d9fa..3d2b5dfd25dd506ab0914e2dcc80978a9f65f10d 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
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_container_delete_package
 description: A count of container images that have been deleted
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 60f25e8cd6013fe41ae2708d66c9eddeaf9cf639..ac1551d4a1cdc8bdaa17036b06a37957b36d1e8a 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
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_container_pull_package
 description: A count of container images that have been downloaded
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: removed
 milestone_removed: "14.4"
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 d660058cf73838d5b93155f3b649c46c071d3dff..5cf2e8e61eb983c1255409beb5b4fe36d100b640 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
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_npm_push_package
 description: A count of npm packages that have been published
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 395db445777ffba829c460201b832b9d91bcf5f4..534731aaad2a07e8d0e6f9392750f4adaaed09c3 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
@@ -5,7 +5,7 @@ description: A count of packages that have been published to the package registr
   by a user
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 time_frame: all
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 40a901ceeaabc589a581b95fa6833901a5fc0262..30fce58485a6ddb4b3a2e837210bafcd1227e133 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
@@ -4,7 +4,7 @@ key_path: counts.package_events_i_package_terraform_module_pull_package
 description: Total count of pull Terraform Module packages events
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: '13.11'
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 49d3401ab6990ea7f779089f12ac9a76d4d649fe..c3df0f74dafc464465823fec52dfe05f0eb13a57 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
@@ -3,7 +3,7 @@ key_path: counts.package_events_i_package_helm_push_package
 description: The total count of Helm packages that have been published.
 product_section: ops
 product_stage: package
-product_group: package
+product_group: 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 bd153f5ec1de544e0e3810ba10b75aee996be1a8..db33a2774a2a98bf7baaabff17c04d08b11f2f5a 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
@@ -3,7 +3,7 @@ key_path: counts.package_events_i_package_nuget_push_symbol_package
 description: A count of NuGet symbol packages that have been uploaded to the package registry
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: "14.1"
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index d4f3bedaa6e4dfee023b82f6edf665e1cf18dc70..03a2efabc5811a74442b207a9644f6513fc51eaa 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -4,7 +4,7 @@ key_path: container_registry_server.version
 description: Identifies the version of the external registry being used
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: number
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 469ba762cf531b96b42c62f455b4b35465c68b62..3edc38ec99f05532e2b662f28251960e30d79404 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -4,7 +4,7 @@ key_path: container_registry_enabled
 description: A count of projects where the container registry is enabled
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_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 ac359a9ff7befe087390872e3710944095cceac0..3dc98910eceb1491210af16c8d003f7441f8e54f 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -4,7 +4,7 @@ key_path: dependency_proxy_enabled
 description: A count of projects where the dependency proxy is enabled
 product_section: ops
 product_stage: package
-product_group: package
+product_group: package_registry
 value_type: boolean
 status: active
 time_frame: none