diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 9e3f64553f69cf5d2118ec23c697a6169a4c69ee..d46caf936759ff62bc4e5a0748a0c16f907ddcfe 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -17,6 +17,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url:
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 3d2777aebea267083fc123babb602f4063e1ccd8..c95a1e9fad57cc4da99b0c61ae20edbf9bae93d0 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "12.9"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 302dc04e16a50de7824b14f810427acee9c4555f..9a606ec802dc4a4af5ef5a7c2d7e257a50e981d8 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 37c9b9a7b665462bf46af43e1ce3e8ec3995744c..590ca4e5f37daed454cddcfb1024ed89e0640977 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -16,7 +16,8 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url:
 milestone_removed: "<16.4"
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index 63d1ed5d0c655d5e1438537756b0d8ed89296b98..f5a4882aca599c3b3b58075e1fdc7184b270db54 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -12,7 +12,8 @@ time_frame: 28d
 data_source: redis_hll
 data_category: operational
 instrumentation_class: RedisHLLMetric
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 events:
   - name: p_analytics_ci_cd_lead_time
     unique: user.id
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 9b192fa26a0b9150c64245d7663ba9c980b116a6..fe90390283fe8092ac37bf5d2a5a8e99b6c7f8c4 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index b2c70204679edbc5c9def706914cf1c416d08c7a..6b830d88d52bc6c47b74a629be3ffe1f2300b0fd 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -13,5 +13,6 @@ distribution:
 - ce
 tier:
 - free
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index c9c85bca41513077dfb93eff72675e637d2a021a..907eed3b822960defedb892d3c85449dbfd3a6c8 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -19,7 +19,8 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135755
 milestone_removed: "<16.6"
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 434d9989ed4f90d0edad0991238f4a7858e9c38e..da869a35fa81408c49415ad1d90c077c45cbaf80 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index ec679b1089f268d2a1dcd5c874b50113caaffd12..f10bbe69e95a8540e1bf8125aabeac2621ed05d3 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 0bd0e783c0a16672b9e3aa2af8f64db80344a310..265f8f394a1383fdf3759e246b779bccef3ee779 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 0c8103284a3e7a588a537534a948eda57774049b..7f06be1decb7b2cd7b1c7743b9f6951b2b86a305 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -16,5 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
index 9386e5722716b9f38ab996a291fa98561184b418..5c485b07a7e6c640cb558c4803cb187660fa7b3c 100644
--- a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
@@ -21,4 +21,5 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
index 958c7cc1436d647b551cd95f442f2fd5eac973cd..3a3f8ac6d0ff9b924c15e64c1a874beb2d769466 100644
--- a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -19,4 +19,5 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/ee/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 4fe39544d40a9b2ac8e9c201e673436d8220e3f5..673d100590e2d7dc3bfaf04f600c1d6611282752 100644
--- a/ee/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -18,5 +18,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
index 90f54d3703dab8d1569ba1676c72f03cc496d675..d2c91372cd3f57db90c204fcf3d4a18c9208ffae 100644
--- a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -16,5 +16,6 @@ distribution:
 - ee
 tier:
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183906_g_compliance_audit_events.yml b/ee/config/metrics/counts_7d/20210216183906_g_compliance_audit_events.yml
index fe16dd381774a54fad86a9cd37f08c35a34dcdb6..9109f840f64796ba2922243c9978ea15ffb32c50 100644
--- a/ee/config/metrics/counts_7d/20210216183906_g_compliance_audit_events.yml
+++ b/ee/config/metrics/counts_7d/20210216183906_g_compliance_audit_events.yml
@@ -18,5 +18,6 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type: 
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
index b3506cc4587887e8ec51058cf3144954fdb97969..7f5fc8da6cb3720631c165fc14bb4057a776490d 100644
--- a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -16,5 +16,6 @@ distribution:
 - ee
 tier:
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
index 5da3fc5d7eb5cc77738adb6bccb0432daa02292e..5139a23242832eed9096ed1b539e3a7fc2fa84e3 100644
--- a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
@@ -14,5 +14,6 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182112_sast_jobs.yml b/ee/config/metrics/counts_all/20210216182112_sast_jobs.yml
index d4a2739974f9b7392ba8691b36d99763678c4348..3cf0f521f5491f2788cde496e79f2f3ce4d97397 100644
--- a/ee/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -17,5 +17,6 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"