diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 53c10d5f253af6d3e6441381d051fc312c976b99..b6c1f2ea507df5670759c30771cd13fe8608d9b6 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -42,5 +42,6 @@ tier:
   - free
   - premium
   - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: '<13.9'
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 9000f41260702c5bf280d05d60480a1c130a74c4..b027957e130f6e29688338a918e603225716f0a7 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 name: 'count_distinct_user_id_from_enabled_clusters_attached_to_projects'
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 5ee19950f494080e214ccf473f6632ee80253357..28a9d320746487776a0c79740992dff59138b532 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -43,4 +43,5 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index a9bc74e96e6b1ae422c099da9b736058d4bd0e93..22ed6967e32648c6098f2cc45e3aa55bc6f25855 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -59,4 +59,5 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index b0c5b9612633ec38b12ac4c699f6a9100768da2f..84c8d986b1864660347fc393187742ea46dc2f14 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.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/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 8e6c286aa3294e0044beb776be46ceff2cf8f0bb..a34abaf4b9cb584f4f7bb8bb4968e2643144061f 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -35,4 +35,5 @@ tier:
 performance_indicator_type:
 - smau
 - gmau
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 54011fb87ce05708a1b0bb8bd0b59c82612c7b2d..1193654a75f7f2f8c07167c3180c0c01ca4f0e26 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -16,4 +16,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 3106b6bf7bb81b7e04c6d2d6071ec1c93aa3a6ab..0a68a3db1ee760724ee4deb692b9a04dfd808b92 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -14,5 +14,6 @@ distribution:
 - ee
 tier:
 - free
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index bd067804cbbc1ae89974b07c20f93da68272e73e..3126519fb36bb104f1a1fdb1197613fd7ff96ad1 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -17,6 +17,7 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index b1141edc39c4edc95124077242a0b60810599ea6..d0fa2c434d25abc7d20c97346cefed470eb2e841 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.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_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 28bf9101656684a717cf0a2851ae286554219ef8..53e2abe35c07649a7578961a2134cbd28980391c 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.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_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 8a9a3ce892a607647399d17411e0b418c06440a6..89f1a578b0b8d5739f7411fd1cbee77cf5cc31a3 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -16,4 +16,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index c82411850d584fbe28900151ac60b7d04256fc3d..283bda46c860b4aa3c466b699264f7c3879050dc 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -16,7 +16,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/112571
 milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index bfb402c257ea98b24930c4db4c771ff4c32d8600..2e1bbeca9a27a402bc5eb1e4dbf1b941c885ee90 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.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_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index 32f91f6faf64b50c7dfc5ff939e2767894f485ef..3bbad9b4e62b2626b6638b87b0ee789e0254f152 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.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/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index df53d2784d2d634ddf59f07b0dfbc6b443a128f8..4e035f5bb5a669c1624eb1b83d06384d55fb1394 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_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_all/20210216175032_requirement_test_reports_ci.yml b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
index c75b5940efb26c62bc3538810c42802006ce7c41..4c8681d1091b6d7880578281673888239855c676 100644
--- a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
+++ b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
@@ -13,5 +13,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/20210216175034_requirements_with_test_report.yml b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
index 6d49cfcaadb535d4493ec431f0568c92ecf26229..8166c37599a034d6b1c06fd23b1a28fd55452c38 100644
--- a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
+++ b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
@@ -13,5 +13,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/20210216181212_epics_deepest_relationship_level.yml b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
index 870191b12aa4a4dd0bc01bc7d009473652c0bee8..098b10878dc89de1f89d82b842d7ba8ad56e3339 100644
--- a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
+++ b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.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/20210216182019_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
index b3f461f828db1a1e0426d0ac5874cdbe6e1fefe1..496dfb5cb4e98ad66e8ecf48de19e54c857124ec 100644
--- a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
@@ -14,5 +14,6 @@ distribution:
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- customer_health_score
 milestone: "<13.9"