diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index bf38efedcd3b356ba848dd45c07e3b587d38683f..2d9432c0e0d4249486eb32163fb872bbd29e11bd 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -21,4 +21,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 6da19fb6a93a12000b6d2616b3bb7230a21e69d7..f14964f5b76a0b4cbe3cd8d6b56670f7d0b8c698 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -23,5 +23,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index bcfa88f9b6e1a222c719d66a2e7081dab0b034c5..4cd3291457ce3d00b1d3b7b23f44337158bdbabe 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.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_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index bed2969b14a862ac46c469d1acd9faad230f06f3..a7b702bbed7cb5a7d0068a0f2454200d439d3f32 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -19,5 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index a11c1be42f28d0940cc69b14a14ca5737722f0c6..355669a2580fc6dc7f973084df08f3a0f1a4b564 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -19,5 +19,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 7929ef37d7b45e998b8ad6705aac779d3c1d4b11..2bc014e55d2aa6389db16b7d79e3d83e4b7b5592 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -21,3 +21,5 @@ tier:
 - premium
 - ultimate
 milestone: "<13.9"
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 97ff6a51c48d9155df2203810a350525e4b6c54b..1847eaf86a76cdd09383ee9cdcf7327549b94b41 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -188,6 +188,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/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 6569027515fedf42562d2c2de5a7cd8e4eeccb99..e151c55c1bcee8cc17e3826fbe69596e8c965e5e 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_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_deployment_frequency
     unique: user.id
diff --git a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 3fa819ec1d2a6f5f107edef2bc86cac16b12f89b..9b7efed1b2bd8f178ef0bb09e9719743cc60326b 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -24,3 +24,5 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index a08f20261ce9acba8bae0cf986a37d11db1cf2fc..b9651ed03294d987749857d27ed5b278042f28d5 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.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/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index e8ea8707f0ff28f34e3078bc4f6954b1e672115f..479df8fcf22a4ef80cb8ed160ba1009bee8bd6ce 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.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/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 3b896103527f2d5e37d03a73b67dc9200e851bb7..a4d7c8fe7b1e1dcbc677cdcd4e4e52fd64db00bd 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.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/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index f701a312446e93fb0b4a2323ac82f15247bf4a83..606b8dd147fc00cfc14718d9485de52f58b88e57 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -16,6 +16,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 instrumentation_class: CountCiRunnersMetric
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 0e4fee17e6a660a7e3d9cf1522751f326112eac1..218e56109c1943cb7ae9d9d9c54e54895e8938b4 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.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/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index 4a9f00fcb6522e7849dece45d61c80943ad9c2b2..7685d13e3d7c89659e30d58f4f27b51887fc4e3c 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.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/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 90f7f20bb836925e060a1d468d888c89d54d802f..88c8b518cfd8d2eb17c55e92e450742e9fca6c9c 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.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/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 2c09473aca21aecdecafecae3fcafd1ae82d96f8..248ec9c32ce37c3cd932dd98b75ac0887195546a 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.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/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 076264f15ac87db84de47631e46ac50a0ca7ec50..5100a862f907ff9aed01ded4b4e9722adf0f5cc5 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.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/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 98fb0df53a5a1e219caab5f590efc10bdfce20c1..57614d7f25e085f714bab65475cc8b279b6df15f 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.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/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 4ad72578b0e9b6b780c50f8b1af7610979643172..23291383518673aca8e211073aa2d0bce16b8f82 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.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/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 82ad0e12b5f7f3a09ef3111936d983798366d1e7..e37dabb87ee9ada80a20e86a19520b4c0e271489 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -22,5 +22,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index ffdc4e0cb8a53747dfe303fda19571d6cdae33eb..415f9f8cca6c76fad064fa10eb27350a9147ee7f 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -23,5 +23,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 5f58ba811659ab0eca981bbf776cd1b3a7f2ba66..538a5a33c9aabd994d5af48d42ba34a5f7289938 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -23,5 +23,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index f98b9cb96fb4a3fa398cb710ea68f28260b4dad5..469ba762cf531b96b42c62f455b4b35465c68b62 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -20,5 +20,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index dd9a623dc75ec395a2138d14b470f31ec7aed19e..f1560eb01d1824f7015573fa806af8900a0f62e7 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -20,5 +20,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index f7ed9d0486278af828fc71a69674d45c81520b58..97ea6ccc5c51cf3ae49e50f6cb4a8b9fbcb7d0bc 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.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/20210216175222_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
index 8c3111960f9a09212190e28aff9bb58aebe717e6..e1b82fb36a51fcc6ad4f76bc2e4fe8c71b4d3b63 100644
--- a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_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_28d/20210216175224_user_license_management_jobs.yml b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
index 5253d40e0310b4ad91bc7fca15e94508974c6bb4..eea3e5735f6ee221cb883c4976aa4da88dbe6927 100644
--- a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175224_user_license_management_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_28d/20210216175226_dependency_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
index 3eee489546f9d6acac377030010962ecd91ff9f6..1d8f8e3014081f1148fe74c510d3430543014439 100644
--- a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.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_28d/20210216175507_container_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
index 329b140a84734521271d2b0291b7761379e2d204..8d4b5d94836c3362c7cdc658a91069d0a9287500 100644
--- a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
@@ -18,5 +18,6 @@ tier:
 - ultimate
 - premium
 - free
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
index 3ceeb9e821873b9bc8c8ca5ff383f6a4db02f2ee..dcc3f727cae89d2b7595d78fc76a6cae51cc652c 100644
--- a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216180355_user_api_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_28d/20210216180359_coverage_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
index 4b2275c8e80f367cf1acb05609ab4d8a0ec5d2c9..1662ff1fa31ea1484a7d88dde895bdf1d7abdde7 100644
--- a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
@@ -17,5 +17,6 @@ distribution:
 - ee
 tier:
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
index 68f03411eddcf2d27c3b7319902640a8b8cefacc..5189f26e915e69a7ecfd029f507387d81fee52f7 100644
--- a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.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_28d/20210216182125_user_sast_jobs.yml b/ee/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
index 604b59cde7f5eb96b0d0bf383fe26a552d6d11fa..aaa455642ee0184ec4981b69f78199e9ac5cd514 100644
--- a/ee/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216182125_user_sast_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/20210216182127_user_secret_detection_jobs.yml b/ee/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
index 7225c35b899f7d55c246c965406dafaa843837cb..410040b1640d6491bf4249a3ddb5a007278a1e5d 100644
--- a/ee/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.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/20210216182131_secret_detection_pipeline.yml b/ee/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index 351629db5a26a4b2804b9b18c7fb8d743e5c5247..2b857acdfbf29339186637f7257d9f36081aa045 100644
--- a/ee/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216182131_secret_detection_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/20210318183733_epics_usage_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
index 659f2f5d5afb548c04df902e02535c28123fccc7..577bc411a51d0f37c21875831876576f9ed11be4 100644
--- a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
@@ -60,3 +60,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+- customer_health_score
diff --git a/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml b/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
index 8365d39663428f3418c734f226a7a4684871bba8..378e9cd8f688459f178e38bb86917ded9b1d181b 100644
--- a/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
+++ b/ee/config/metrics/counts_28d/20211130091657_groups_with_event_streaming_destinations.yml
@@ -17,3 +17,5 @@ distribution:
 - ee
 tier:
 - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
index 7a5df511bfbe3a06c7b11367106c10b856201cd7..f08c007cdfce84231120367b4d7f817d628043fd 100644
--- a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175848_projects_github_active.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/20210216181206_epics.yml b/ee/config/metrics/counts_all/20210216181206_epics.yml
index 8b9cff74a4a658f46bc3947e1b518ef35245cb7c..b833bd7014fef4c979de2fde311015f2b291dc63 100644
--- a/ee/config/metrics/counts_all/20210216181206_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181206_epics.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/20210216181959_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
index 2e6883f44425be260cd4fccdd0b815a35d9f4240..0d18fea172d38178d09cd66badc4e0f264008e0c 100644
--- a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
@@ -15,5 +15,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/20210216182008_template_repositories.yml b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
index a4a730819921d0b02079f3808c5596204190b2f4..375cab2783c444d985c632a14128548782545c6d 100644
--- a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ b/ee/config/metrics/counts_all/20210216182008_template_repositories.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/20220308155129_external_status_checks.yml b/ee/config/metrics/counts_all/20220308155129_external_status_checks.yml
index 77b28d7e65e87f68db592f792b73bb93fb92ce3d..4a1ae934701398d88c9f3f16c91c5e10e9e9b201 100644
--- a/ee/config/metrics/counts_all/20220308155129_external_status_checks.yml
+++ b/ee/config/metrics/counts_all/20220308155129_external_status_checks.yml
@@ -16,3 +16,5 @@ distribution:
 - ee
 tier:
 - ultimate
+performance_indicator_type:
+- customer_health_score
diff --git a/ee/config/metrics/counts_all/20220308162514_projects_with_external_status_checks.yml b/ee/config/metrics/counts_all/20220308162514_projects_with_external_status_checks.yml
index 6fd57fec42e2e8d3bc83d6c94b97c7ab6a82953f..e9d498ae140b3de37974a25caf3b55662ce116bd 100644
--- a/ee/config/metrics/counts_all/20220308162514_projects_with_external_status_checks.yml
+++ b/ee/config/metrics/counts_all/20220308162514_projects_with_external_status_checks.yml
@@ -12,7 +12,8 @@ time_frame: all
 data_source: database
 data_category: operational
 instrumentation_class: CountProjectsWithExternalStatusChecksMetric
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 distribution:
 - ee
 tier: