diff --git a/Gemfile.checksum b/Gemfile.checksum
index f0f0c98138c..962d6d858ad 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -45,7 +45,7 @@
 {"name":"axiom-types","version":"0.1.1","platform":"ruby","checksum":"c1ff113f3de516fa195b2db7e0a9a95fd1b08475a502ff660d04507a09980383"},
 {"name":"babosa","version":"2.0.0","platform":"ruby","checksum":"a6218db8a4dc8fd99260dde8bc3d5fa1a0c52178196e236ebb31e41fbdcdb8a6"},
 {"name":"backport","version":"1.2.0","platform":"ruby","checksum":"912c7dfdd9ee4625d013ddfccb6205c3f92da69a8990f65c440e40f5b2fc7f75"},
-{"name":"base32","version":"0.3.2","platform":"ruby","checksum":"532e9b19c5dd1fce281df67fc93a803ebd5d26426a93f6dda6612769bc46fe2c"},
+{"name":"base32","version":"0.3.4","platform":"ruby","checksum":"cb9810ab7c79862ed6ead254b3a44fa2535d088396cd412eef38bdc206055aba"},
 {"name":"base64","version":"0.2.0","platform":"ruby","checksum":"0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507"},
 {"name":"batch-loader","version":"2.0.5","platform":"ruby","checksum":"964bf638b8f498bab40abaafc6f89c057b2e02aa25b64fc1ec12872ad6bff213"},
 {"name":"bcrypt","version":"3.1.18","platform":"java","checksum":"5464e06c00cb6bd3ff982feef4cb7f1efc9b302753cbaf12e73512d8f401f2d2"},
diff --git a/Gemfile.lock b/Gemfile.lock
index e2e3826788c..69f8f287c8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,7 +366,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (2.0.0)
     backport (1.2.0)
-    base32 (0.3.2)
+    base32 (0.3.4)
     base64 (0.2.0)
     batch-loader (2.0.5)
     bcrypt (3.1.18)
diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum
index af849c8922a..f7c8a4c0072 100644
--- a/Gemfile.next.checksum
+++ b/Gemfile.next.checksum
@@ -45,7 +45,7 @@
 {"name":"axiom-types","version":"0.1.1","platform":"ruby","checksum":"c1ff113f3de516fa195b2db7e0a9a95fd1b08475a502ff660d04507a09980383"},
 {"name":"babosa","version":"2.0.0","platform":"ruby","checksum":"a6218db8a4dc8fd99260dde8bc3d5fa1a0c52178196e236ebb31e41fbdcdb8a6"},
 {"name":"backport","version":"1.2.0","platform":"ruby","checksum":"912c7dfdd9ee4625d013ddfccb6205c3f92da69a8990f65c440e40f5b2fc7f75"},
-{"name":"base32","version":"0.3.2","platform":"ruby","checksum":"532e9b19c5dd1fce281df67fc93a803ebd5d26426a93f6dda6612769bc46fe2c"},
+{"name":"base32","version":"0.3.4","platform":"ruby","checksum":"cb9810ab7c79862ed6ead254b3a44fa2535d088396cd412eef38bdc206055aba"},
 {"name":"base64","version":"0.2.0","platform":"ruby","checksum":"0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507"},
 {"name":"batch-loader","version":"2.0.5","platform":"ruby","checksum":"964bf638b8f498bab40abaafc6f89c057b2e02aa25b64fc1ec12872ad6bff213"},
 {"name":"bcrypt","version":"3.1.18","platform":"java","checksum":"5464e06c00cb6bd3ff982feef4cb7f1efc9b302753cbaf12e73512d8f401f2d2"},
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 8321548f5c2..7b787429db8 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -378,7 +378,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (2.0.0)
     backport (1.2.0)
-    base32 (0.3.2)
+    base32 (0.3.4)
     base64 (0.2.0)
     batch-loader (2.0.5)
     bcrypt (3.1.18)
diff --git a/app/assets/javascripts/graphql_shared/fragments/base_project.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/base_project.fragment.graphql
index 8facd01e3d4..bdd0e873bdb 100644
--- a/app/assets/javascripts/graphql_shared/fragments/base_project.fragment.graphql
+++ b/app/assets/javascripts/graphql_shared/fragments/base_project.fragment.graphql
@@ -35,7 +35,7 @@ fragment BaseProject on Project {
   }
   isCatalogResource
   exploreCatalogPath
-  pipeline(iid: 1) {
+  pipeline {
     detailedStatus {
       ...CiIcon
     }
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
index 989a783427c..9f20cdc2b98 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
@@ -195,6 +195,9 @@ export default {
     pipelineStatus() {
       return this.project.pipeline?.detailedStatus;
     },
+    dataTestid() {
+      return `projects-list-item-${this.project.id}`;
+    },
   },
   methods: {
     onActionDelete() {
@@ -223,6 +226,7 @@ export default {
     :show-icon="showProjectIcon"
     icon-name="project"
     :timestamp-type="timestampType"
+    :data-testid="dataTestid"
   >
     <template #avatar-meta>
       <gl-icon
@@ -246,7 +250,12 @@ export default {
 
     <template #avatar-default>
       <project-list-item-description :project="project" />
-      <topic-badges v-if="hasTopics" :topics="project.topics" class="gl-mt-3" />
+      <topic-badges
+        v-if="hasTopics"
+        :topics="project.topics"
+        class="gl-mt-3"
+        data-testid="project-topics"
+      />
     </template>
 
     <template #stats>
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index d462a2186f9..a2db655669b 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -9,9 +9,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: update_design_management_design
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 94f703fcf3f..f00def20709 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -9,9 +9,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: delete_design_management_design
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 9c12fb058a2..b3820396506 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 2b908ca007e..c9e7b47d284 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index c5ec5d52110..53a4c8d92ad 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -8,9 +8,6 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344100
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 8cf91249e71..2c0c6713f83 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index d0a82c5f8a5..880197f3162 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index d85c963831e..c959e4b069a 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -7,9 +7,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 4167125509f..1c96f63b212 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -7,9 +7,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index 29e4083243d..32086293b6b 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index c7951ec95b0..c51a2519fdb 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index 96333818e01..11a189b1252 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -8,9 +8,6 @@ status: removed
 milestone_removed: '14.4'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index d233b519c44..c3d8d83ff3d 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 885345fc69a..89890a56767 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index 48e2db60be5..0cfe87e788e 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index fd2a58ae459..a899aa8cd33 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 14b3b07ff3b..12f1d7a8856 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 9fa22d2cb3f..7e64067ba2d 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index 6f1f609e32e..166a7158c7c 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -7,9 +7,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 8d2134ead13..ff643bef35d 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 339f710ffe5..f3fefd30128 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -7,9 +7,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index e7c60b56258..fa97b2b6dba 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 246608105fa..441a28354aa 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index b226649d207..11be913b123 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 18819009922..f35c29db496 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 82b75d2a707..5716726138c 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -12,9 +12,6 @@ data_source: database
 instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: false
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index d26a8f4480f..18e64d0a527 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -12,9 +12,6 @@ data_source: database
 instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 14915fa0b94..47deb6587eb 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 1
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index 21ead0fd972..15e0e5a2200 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 5
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 825d52f1ef0..b996803d361 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 10
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 9fc3ca16874..c74f1e13288 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 25
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index fc0b7758283..8effc2810f1 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 50
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 7bb792fd91b..d5d83feea9c 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
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: 100
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 9b292e06329..ed5d0f7f6e4 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   cadence: 1d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index a5b6bd11f8b..3510dfe1c64 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   cadence: 7d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 5aaaac9fc2f..c52517ac64e 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   cadence: 14d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index 44eab1bcc36..a21f68575e1 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   cadence: 1month
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 2aedf574c86..bbdfc2bf8bb 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -13,9 +13,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   cadence: 3month
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index 686bbf76d23..44305ae0b48 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: 7d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 005837a7059..afa55afb463 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: 14d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index e174f8cba35..daa405f7f36 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: 30d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 540d536cd51..460a9034cfd 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: 90d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 5ca8d64cda8..71dc2273789 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   keep_n: null
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index ffefa22a0c9..1a7f0d52826 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: null
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index ee486de0a22..fc6caa33a93 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -10,9 +10,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: system
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 8f75f112d63..80f6a7acdde 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 5d1d29f5e10..f2078ccee23 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -8,9 +8,6 @@ status: active
 time_frame: all
 data_source: database
 instrumentation_class: CountIssuesMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index c686a493a80..6ae84473734 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 4eeab28ab83..d16f4548c73 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 5743a95cc0e..d4fa98650e8 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index a3c8269717d..068cf45daf5 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 97aad04e3e1..7264c885d66 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index f86e1e9764c..39f3d8c0502 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -8,9 +8,6 @@ status: active
 time_frame: all
 data_source: database
 instrumentation_class: CountUsersCreatingIssuesMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 3a17f3b6ce2..7e536ab3d01 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 6268d9b52b2..cdc3e4bbded 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index b9946078be3..2bcc225ce58 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index 567b3d5541c..146d0ade59c 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index e876514083b..2cfea7f533c 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index a512409238d..143b6084ea0 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 1691bc49b43..d823f38cfd6 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -10,9 +10,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 27df2a581f3..1c43cac6b36 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -10,9 +10,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 4ccdfc3bae2..7b86c40d297 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -7,8 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ee
 tiers:
 - premium
 - ultimate
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index e1c8a2e6aa3..159852c5050 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 846da72c45a..561cf5eeb30 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 2a3ea029895..7c4d1827df6 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -8,9 +8,6 @@ status: active
 time_frame: all
 data_source: database
 instrumentation_class: CountBoardsMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 3757bc50543..1ceeb17b081 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 13668582eb5..e8ad78cc812 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index ce240bf78a0..e5abc48851b 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index e2cce51409b..0665883e98b 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index ac070b852af..7880aa902ee 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -10,9 +10,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 5dad18b7a38..85ad927c228 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 8154a713432..a631b3b23fa 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -12,9 +12,6 @@ data_source: database
 instrumentation_class: CountDeploymentsMetric
 options:
   type: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index ceeee239d7d..87bf2e6af4f 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -12,9 +12,6 @@ data_source: database
 instrumentation_class: CountDeploymentsMetric
 options:
   type: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 6d036d59310..b0dd8fe91f4 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index e3bd8a523de..d5a0775be1d 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index 3a1efec551d..994791ad93b 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 942cad9adf4..6b7d1697fb1 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 9b1a805bc13..c1339771416 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index c0a296feec4..e21b77b955e 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 7f0943248c7..335395b2d01 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 36371ebeb45..27c7be0ddff 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index d958e2f3979..dd45fa1f6b1 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -9,9 +9,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index a496db773ef..1d34b636e6b 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 63bd4531d6f..4955608b0f2 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -9,9 +9,6 @@ time_frame: all
 data_source: internal_events
 events:
 - name: create_commit_note
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 2f1f8ac037c..7d272d40873 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -9,9 +9,6 @@ time_frame: all
 data_source: internal_events
 events:
 - name: source_code_pushed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 18e67662949..a162507ac38 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 0d9a03e598b..da3c9a15c25 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 3cc7d821cb1..17139e27fb2 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -8,9 +8,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 6d0835139dc..f00d8f83457 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -8,9 +8,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 28215388857..c937510229e 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 3aa8168ebf3..2169e4850bb 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 0967d5f0770..2e322654a1f 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 691f005ddd3..979c1f3b66f 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index a462b1f5137..f6d617398ca 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '14.4'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 0e73561cb1d..4bc534734db 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 31480aa05d0..2ec2d22e0bb 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index a88dc2b14a9..e10d7c94009 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 3f70276bbfd..5074b4e14de 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 3b5ad5a16f7..41012c90696 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 7c3957a547b..e5c085b1200 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '14.4'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 3591c2d28f7..b58c51200b4 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 75c4e0fd330..46d293faaf4 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index 17440804c23..bbeb500d4cc 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index eabf7720b83..5e5b960cd90 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 990336f72a3..e1ea30c3279 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index 9508d630aa2..ad30fcb43e5 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 7ca815b4a97..35fb511a550 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index e2f2b766ae4..be04c4a2f7f 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index bcabab61c44..a0b4b091275 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index 60304766490..bcae817eb1c 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index 7e34d09537a..c4e47f005b3 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 454e56e7976..ac92a35efbd 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index a763d964fcb..bd3ca587b67 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 8d1de88a1f1..d3c35fd217b 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index db56d9ab5c2..6121ee61183 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: '13.12'
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index 97f342d5ade..a5e3bc81a3f 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: composer
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 11e0f374c3b..6711af34e69 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: composer
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index 6da21b0e9e3..968489d7a6c 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: composer
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index d8605dcbae1..af18b12b96d 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: conan
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index 5e3173f1fdd..4d247111aab 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: conan
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index 53a40068fa9..24b6dea9767 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: conan
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 fc0a64caef7..a131d7641c4 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
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: "14.4"
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 6e0e4725329..3d1d4053fed 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
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: "14.4"
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index 20d861729e6..de4be38c05d 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: "14.4"
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index 50f5781f181..8e6b18f4d34 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: debian
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index ce11537b763..cee6d940305 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: debian
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index 51a2722c4e4..ab87083efff 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -10,9 +10,6 @@ status: removed
 milestone_removed: "14.4"
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index efff0d46217..7a1c2a12034 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -11,9 +11,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: delete_package_from_registry
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index f0126c3a531..f09163c16e6 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       property: deploy_token
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index 627967486cc..c7685d7358f 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       property: guest
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index f5867085f55..36d388a26a1 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       property: user
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index 09faff5f3db..59d64f2acf7 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: generic
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 9b02844ac6a..b7a6a15ba4b 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: generic
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index e717ee638cb..6a4b8263893 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: generic
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index ca4911daf06..c09f3554a17 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: golang
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index 989c53c6bdc..15cfaa70853 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: golang
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index c267766c300..2faef340cb1 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: golang
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index c45b7b714f8..1fb95dde971 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: maven
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index cb802f84d56..9081c32f4f2 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: maven
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 80cd41b22bd..2d922ee2538 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: maven
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index 82b8ca2bd3c..dc1cbbb0963 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: npm
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index aa32f757ce6..07d58c86fce 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: npm
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 da34891cbcf..f3c837fd320 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
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: npm
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 689b3867c96..8ea9f2fb490 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: nuget
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index dd8f8539ab5..393224ef790 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -13,9 +13,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: nuget
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index be4c7da22e3..9eadd8e57aa 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: nuget
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index 7f07d8e647a..50d95b21159 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -11,9 +11,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: pull_package_from_registry
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index 7134bcb6949..2566448ee8a 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -14,9 +14,6 @@ events:
   - name: pull_package_from_registry
     filter:
       property: deploy_token
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 87449618012..5c1b9d33420 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
@@ -14,9 +14,6 @@ events:
   - name: pull_package_from_registry
     filter:
       property: guest
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index bdcd26fc44d..2e230eb7a21 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -14,9 +14,6 @@ events:
   - name: pull_package_from_registry
     filter:
       property: user
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index 513c3e31c49..b5e3812bb1c 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -11,9 +11,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: push_package_to_registry
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 607a67cc78a..aef40329d4a 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
@@ -14,9 +14,6 @@ events:
   - name: push_package_to_registry
     filter:
       property: deploy_token
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index d40cf31ba32..1ca98bc3f0b 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -14,9 +14,6 @@ events:
   - name: push_package_to_registry
     filter:
       property: guest
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
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 559be434839..5db96e5d640 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
@@ -14,9 +14,6 @@ events:
   - name: push_package_to_registry
     filter:
       property: user
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index 2a952227b94..594e94eb15e 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: pypi
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index e3c32d74543..d98c09d5c53 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -14,9 +14,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: pypi
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index b99512f3dac..28c29e448a8 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -13,9 +13,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: pypi
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index 34e08955dd6..0d7eadccc4b 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -9,9 +9,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 1e1e4df9a2f..17283a238a2 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -9,9 +9,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 8ca9ef5b127..57e14d64daf 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -9,9 +9,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: redis
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index a34d36335ff..0464964567e 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -13,9 +13,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: view_wiki_page
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 32b4dc6dabf..6fa73adc45d 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -7,8 +7,6 @@ value_type: object
 status: active
 time_frame: all
 data_source: system
-distribution:
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 653fb5398b8..e4e91710b87 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -15,9 +15,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: rubygems
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index 1c70218f45c..8939ddeec93 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -15,9 +15,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: rubygems
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index cb4efe3e6c4..f5562cdd09d 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -15,9 +15,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: rubygems
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index 1b9537a7c32..a564763f03f 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -9,9 +9,6 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55782
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index 9213039b9bb..b32041c25bb 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -15,9 +15,6 @@ events:
   - name: delete_package_from_registry
     filter:
       label: terraform_module
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
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 f2d358ed7d1..a3c43fd2810 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
@@ -15,9 +15,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: terraform_module
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index 13603585bdb..8994317972e 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -15,9 +15,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: terraform_module
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index 75d4095ba3b..9d2cb602c1a 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersInstanceTypeActiveMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index 0b327989bf4..7f28238279c 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersGroupTypeActiveMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index 4fe80882244..a82be2a98d9 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersProjectTypeActiveMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 941edab3391..c7c1654fa24 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -11,9 +11,6 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index acc799f972b..ca801095c02 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersInstanceTypeActiveOnlineMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 8321e6b627e..a3fcebb6e2d 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersGroupTypeActiveOnlineMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index 6449dade66a..4a6d2cfd5c9 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -12,9 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
 time_frame: all
 data_source: database
 instrumentation_class: CountCiRunnersProjectTypeActiveOnlineMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index 3f5cd57dc26..6d09531edea 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -13,9 +13,6 @@ time_frame: all
 data_source: internal_events
 events:
   - name: request_api_proxy_access
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index 4a44572b5ac..8b613b8cb34 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -15,9 +15,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: helm
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index b0b9dd78e19..fe2c4f13bb7 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -13,9 +13,6 @@ removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92280
 milestone_removed: "15.2"
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
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 c965eed4cad..6bf58720406 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
@@ -15,9 +15,6 @@ events:
     filter:
       label: helm
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index 7de6c1ed9e3..3be89d06082 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -15,9 +15,6 @@ events:
     filter:
       label: nuget
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
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 496661d86d1..04b72bd5ff0 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
@@ -15,9 +15,6 @@ events:
     filter:
       label: nuget
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index 5d553fff691..4668403cd7e 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -13,9 +13,6 @@ data_source: internal_events
 events:
   - name: pull_symbol_package_from_registry
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index 0ca96e88205..f3b83eaec5d 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: deploy_token
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index 5cf4d4d4241..9c5936f223e 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: guest
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 76a12bc38e0..86923277a58 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: user
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index 7ec513f0361..a7db01d6133 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -13,9 +13,6 @@ data_source: internal_events
 events:
   - name: push_symbol_package_to_registry
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index 78d16776034..16466a0d861 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: deploy_token
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 6419a86b95f..6752ec950f5 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: guest
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index 50926b86d73..6d3d235419b 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -15,9 +15,6 @@ events:
     filter:
       property: user
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index 96a7e5c7b19..f2de6d09095 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
@@ -13,9 +13,6 @@ time_frame: all
 data_source: database
 instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric'
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index d31f299ddd8..5f44f90d1ef 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
 time_frame: all
 data_source: database
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index 58ccb7785b6..5f2c552b784 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
 time_frame: all
 data_source: database
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
index 479fd4f40b3..04a4b0edf51 100644
--- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
 time_frame: all
 data_source: database
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 90a1160f557..84caa84c888 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
 time_frame: all
 data_source: database
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index 895848994a7..8031c07c5b5 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -11,9 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178
 time_frame: all
 data_source: database
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index ccf892e665b..a79dfd525c2 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
index c43df4d962f..abb4251a2fa 100644
--- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
+++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
@@ -14,9 +14,6 @@ instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
 options:
   enabled: true
   older_than: 60d
-distribution:
-- ee
-- ce
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index 8b2de102d1f..23fb8b3ac23 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
index 03491005dde..89b5faeeee4 100644
--- a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
index c4416b58a9e..0b891169516 100644
--- a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index 2cc23031841..26793003173 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index f3d803d8e5b..a70ee455606 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -9,9 +9,6 @@ value_type: number
 status: removed
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
index 3398d342e07..432ab480815 100644
--- a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
index 536f48a2fb6..671b5e40480 100644
--- a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 60cf7fad82a..dd2384a8fd9 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 138d63c4064..5bdc41af3b8 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -13,9 +13,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index f42c353b3a8..26214f84ae5 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -13,9 +13,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index b82b974e166..79c72405791 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -13,9 +13,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index 440ce0503ba..3a2a86ed8cf 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -13,9 +13,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index 677fc8daac8..a6d6d95851e 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -13,9 +13,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
index 09307e5b605..0d6eab91447 100644
--- a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 33fdb6e189e..010de23825b 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
index e7b0eaa6225..a073124fa35 100644
--- a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
index 75b3850582d..ca88f51044d 100644
--- a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
index dfb168cd3a7..8100654935b 100644
--- a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml b/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
index 892fda20209..bfa20732cec 100644
--- a/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
+++ b/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 instrumentation_class: CountSlackAppInstallationsGbpMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220607141417_slack_app_installations.yml b/config/metrics/counts_all/20220607141417_slack_app_installations.yml
index 39f233384c5..1055562473c 100644
--- a/config/metrics/counts_all/20220607141417_slack_app_installations.yml
+++ b/config/metrics/counts_all/20220607141417_slack_app_installations.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 instrumentation_class: CountSlackAppInstallationsMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index 888f4e2823f..b727cd86b00 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -15,9 +15,6 @@ events:
 - name: view_merge_request_widget
   filter:
     label: test_summary
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index d5441976ad3..e9f76996e86 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -15,9 +15,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: test_summary
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index c4eb85824ab..ee51f0b2fec 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -15,9 +15,6 @@ events:
 - name: expand_merge_request_widget
   filter:
     label: test_summary
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index f5f37fdfcb2..11439c683bc 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: test_summary
     property: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index fb64e697cdd..a0d7684af0f 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: test_summary
     property: warning
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index 42907dcdf2f..6a308a6c028 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: test_summary
     property: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index 712392a523c..0c009b1de13 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -15,9 +15,6 @@ events:
 - name: view_merge_request_widget
   filter:
     label: accessibility
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index 8bec90740f8..ab4719cfa45 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -15,9 +15,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: accessibility
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index d0b3952b4a4..6343809c456 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -15,9 +15,6 @@ events:
 - name: expand_merge_request_widget
   filter:
     label: accessibility
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index 3f0f5a9e32f..c0fb2c42036 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: accessibility
     property: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 687d99d3dc5..fe7736659c4 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: accessibility
     property: warning
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index 1f93417df5f..89084ff1102 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: accessibility
     property: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index a57d196014c..58805512f11 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -15,9 +15,6 @@ events:
 - name: view_merge_request_widget
   filter:
     label: code_quality
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 8649f6f8568..5fbdc1fe989 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -15,9 +15,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: code_quality
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 50d75fb17ab..e992b60db2c 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -15,9 +15,6 @@ events:
 - name: expand_merge_request_widget
   filter:
     label: code_quality
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index 3218d7c6981..28deade9c94 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: code_quality
     property: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index 3de8021c4d8..17f59a9f84f 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: code_quality
     property: warning
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 7e81a05fb49..b55cd390733 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: code_quality
     property: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index 241f494ea42..75300f3935b 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -15,9 +15,6 @@ events:
   filter:
     label: terraform
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index 5dfacb11aca..19a8a11db75 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -15,9 +15,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: terraform
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index a0c8255a0ac..2d06e3ec999 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -15,9 +15,6 @@ events:
 - name: expand_merge_request_widget
   filter:
     label: terraform
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index a84f3a8c4ed..fd01dd223c1 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: terraform
     property: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index c8b226d51ef..ee01c19e074 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: terraform
     property: warning
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 9b3b797a537..986d9a7cc47 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: terraform
     property: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
index c555a670c71..4dd6ffceb2d 100644
--- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
index 7e771cd889e..ad2b4a9d0a9 100644
--- a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
index c84275d2ae4..1560e1a72df 100644
--- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
index f557f762e83..d7e838a6ce3 100644
--- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
index 448ef217592..df35aefa80e 100644
--- a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 6c7ac866950..719887683c7 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -17,9 +17,6 @@ events:
 - name: view_merge_request_widget
   filter:
     label: license_compliance
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 71f193a341d..66d595bf6b1 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -17,9 +17,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: license_compliance
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index 4c1cb507420..cd0435444be 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -17,9 +17,6 @@ events:
 - name: expand_merge_request_widget
   filter:
     label: license_compliance
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index ff0e4245705..9459867991c 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -18,9 +18,6 @@ events:
   filter:
     label: license_compliance
     property: success
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index c1be88846bd..a2ce73fab82 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -18,9 +18,6 @@ events:
   filter:
     label: license_compliance
     property: warning
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 686f75663e9..9b63516df7d 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -18,9 +18,6 @@ events:
   filter:
     label: license_compliance
     property: failed
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index 9a5675ec7eb..8e3891712ac 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -11,9 +11,6 @@ data_source: database
 instrumentation_class: CountUserAuthMetric
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
index 328ccaf09a4..e3c1a7a390f 100644
--- a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
+++ b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
@@ -15,9 +15,6 @@ events:
   - name: pull_package_from_registry
     filter:
       label: rpm
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
index b02f84e0e99..cbe1a4f69f3 100644
--- a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
+++ b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
@@ -15,9 +15,6 @@ events:
   - name: push_package_to_registry
     filter:
       label: rpm
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
index 7859fcb2246..7298ed04cf6 100644
--- a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -13,9 +13,6 @@ instrumentation_class: GitlabForJiraAppDirectInstallationsCountMetric
 milestone: "15.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
index c5f3f1bfb55..59faa651e58 100644
--- a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -13,9 +13,6 @@ instrumentation_class: GitlabForJiraAppProxyInstallationsCountMetric
 milestone: "15.5"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
index aca01088cc5..6d138b46572 100644
--- a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
+++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: security_reports
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
index d2b6b3e3a4a..a6b7576f465 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
@@ -16,9 +16,6 @@ events:
   filter:
     label: security_reports
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
index e8331ba88d8..e946b3e817b 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
@@ -16,9 +16,6 @@ events:
 - name: click_full_report_on_merge_request_widget
   filter:
     label: security_reports
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
index 0fe8a1d8dbc..a348de2e2b7 100644
--- a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
+++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
@@ -17,9 +17,6 @@ events:
     label: security_reports
     property: success
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
index 41fb1f3173d..2e69b368610 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
@@ -17,9 +17,6 @@ events:
     label: security_reports
     property: failed
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
index 9706d3064e2..ff3b7970d7b 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
@@ -17,9 +17,6 @@ events:
     label: security_reports
     property: warning
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
index 7c6b3de309a..05102b44f8f 100644
--- a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
index db40747627d..7ba75652667 100644
--- a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
index 4c3e82b0e4e..976c1243b59 100644
--- a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
index b4e5bd535b1..1c110c8c038 100644
--- a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
index 1c9b2c2c2a1..19c03206bad 100644
--- a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
index 566610e7e2a..61c66272921 100644
--- a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
+++ b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
@@ -11,9 +11,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountProjectsWithMonitorEnabledMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
index c6d335805cc..83888577230 100644
--- a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
@@ -13,9 +13,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountMlCandidatesMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
index ad288bbb5df..30c281f8994 100644
--- a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
@@ -13,9 +13,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountMlExperimentsMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
index a5e0f5190aa..230db4b1ba7 100644
--- a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
@@ -13,9 +13,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountProjectsWithMlCandidatesMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
index a80beff39b2..92b71c34bea 100644
--- a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
@@ -13,9 +13,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountUsersWithMlCandidatesMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
index 69cd4b63ae6..e11e3db5062 100644
--- a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
@@ -13,9 +13,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountProjectsWithMlExperimentsMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
index 5394da577d6..9894929d045 100644
--- a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
@@ -15,9 +15,6 @@ instrumentation_class: JiraActiveIntegrationsMetric
 options:
   deployment_type: server
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
index 51f46691bf0..ff3d6d69e79 100644
--- a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
@@ -15,9 +15,6 @@ instrumentation_class: JiraActiveIntegrationsMetric
 options:
   deployment_type: cloud
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
index 74652694314..83bb26a54e0 100644
--- a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
+++ b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
index 7471cf0f0db..7c9d19468fe 100644
--- a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
+++ b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
index 18e1c377bc7..eb1ac9eebd2 100644
--- a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
index 81331d6dc82..55f3ed64fd3 100644
--- a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
index e85edbcd7a6..b9a82fcbb2f 100644
--- a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
index 7f509d715df..caf23513522 100644
--- a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
index 0d3f2b122ee..c443720f1db 100644
--- a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
index 443e209ba6c..9fa4f7049af 100644
--- a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
index bf802486356..88456e7a00a 100644
--- a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
index f1193f6af59..5f8fbec2229 100644
--- a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
@@ -12,9 +12,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
index 1892c7be925..308e74efb40 100644
--- a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
+++ b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
@@ -15,9 +15,6 @@ options:
   prefix: container_registry_events
   event: i_container_registry_delete_manifest
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230515153810_groups_clickup_active.yml b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
index 5448fbb649c..98119581ac1 100644
--- a/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230515153826_groups_inheriting_clickup_active.yml b/config/metrics/counts_all/20230515153826_groups_inheriting_clickup_active.yml
index c1a4770b15e..7f0286e2e09 100644
--- a/config/metrics/counts_all/20230515153826_groups_inheriting_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153826_groups_inheriting_clickup_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230515153827_instances_clickup_active.yml b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
index 99a83fddeb4..72825fd0d1a 100644
--- a/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230515153829_projects_clickup_active.yml b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
index 47c3407487c..b026817df95 100644
--- a/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml b/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
index 6ea25a229a4..8822934b216 100644
--- a/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230607170538_projects_telegram_active.yml b/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
index e63008d88b5..f2038f06f1f 100644
--- a/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
+++ b/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230607170951_projects_inheriting_telegram_active.yml b/config/metrics/counts_all/20230607170951_projects_inheriting_telegram_active.yml
index 3ca0cc95b96..55aa6e1d379 100644
--- a/config/metrics/counts_all/20230607170951_projects_inheriting_telegram_active.yml
+++ b/config/metrics/counts_all/20230607170951_projects_inheriting_telegram_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230607171201_instances_telegram_active.yml b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
index 55ec0587eea..e084afd042a 100644
--- a/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
+++ b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230607171312_groups_telegram_active.yml b/config/metrics/counts_all/20230607171312_groups_telegram_active.yml
index 69e586aa875..e2d91ae58ca 100644
--- a/config/metrics/counts_all/20230607171312_groups_telegram_active.yml
+++ b/config/metrics/counts_all/20230607171312_groups_telegram_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml b/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
index 1aebc2a7a2b..1cdb8ad5e80 100644
--- a/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
+++ b/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml b/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml
index 787c77abb01..bcf99a81f14 100644
--- a/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml
+++ b/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml
@@ -12,9 +12,6 @@ data_category: optional
 performance_indicator_type: []
 events:
   - name: create_flux_git_push_notification
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230620073845_kubernetes_agent_k8s_api_proxy_requests_via_ci_access.yml b/config/metrics/counts_all/20230620073845_kubernetes_agent_k8s_api_proxy_requests_via_ci_access.yml
index ba7cbab9e60..d82bc2bd558 100644
--- a/config/metrics/counts_all/20230620073845_kubernetes_agent_k8s_api_proxy_requests_via_ci_access.yml
+++ b/config/metrics/counts_all/20230620073845_kubernetes_agent_k8s_api_proxy_requests_via_ci_access.yml
@@ -12,9 +12,6 @@ data_category: optional
 performance_indicator_type: []
 events:
   - name: request_api_proxy_access_via_ci
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230620074102_kubernetes_agent_k8s_api_proxy_requests_via_user_access.yml b/config/metrics/counts_all/20230620074102_kubernetes_agent_k8s_api_proxy_requests_via_user_access.yml
index a468977f8cb..6a93a39e37f 100644
--- a/config/metrics/counts_all/20230620074102_kubernetes_agent_k8s_api_proxy_requests_via_user_access.yml
+++ b/config/metrics/counts_all/20230620074102_kubernetes_agent_k8s_api_proxy_requests_via_user_access.yml
@@ -12,9 +12,6 @@ data_category: optional
 performance_indicator_type: []
 events:
   - name: request_api_proxy_access_via_user
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
index 821a4406e51..6eed49e8c28 100644
--- a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
+++ b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
index 94dcfb0a378..18fe458ca98 100644
--- a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
+++ b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230809084619_connected_agents.yml b/config/metrics/counts_all/20230809084619_connected_agents.yml
index 4edd8e44243..97d208a469b 100644
--- a/config/metrics/counts_all/20230809084619_connected_agents.yml
+++ b/config/metrics/counts_all/20230809084619_connected_agents.yml
@@ -11,9 +11,6 @@ data_source: database
 data_category: optional
 instrumentation_class: CountConnectedAgentsMetric
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
index db7e52d85e4..187062a9bf2 100644
--- a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
index 1d91c3f364b..070b2241bb1 100644
--- a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
+++ b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20230816085929_kubernetes_agent_k8s_api_proxy_requests_via_pat_access.yml b/config/metrics/counts_all/20230816085929_kubernetes_agent_k8s_api_proxy_requests_via_pat_access.yml
index d1420f83df0..23cd36444d9 100644
--- a/config/metrics/counts_all/20230816085929_kubernetes_agent_k8s_api_proxy_requests_via_pat_access.yml
+++ b/config/metrics/counts_all/20230816085929_kubernetes_agent_k8s_api_proxy_requests_via_pat_access.yml
@@ -12,9 +12,6 @@ data_category: optional
 events:
   - name: request_api_proxy_access_via_pat
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml b/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml
index 2ad52ea02e6..a7ae1d3487e 100644
--- a/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml
+++ b/config/metrics/counts_all/20231204142552_service_desk_custom_email_enabled.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 instrumentation_class: CountServiceDeskCustomEmailEnabledMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
index 0ba7eb53c5f..72c0fc07991 100644
--- a/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
index c71302040f3..2175868fe86 100644
--- a/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231205140200_instances_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_instances_diffblue_cover_active.yml
index d145ad524cd..86d4c5e2b34 100644
--- a/config/metrics/counts_all/20231205140200_instances_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_instances_diffblue_cover_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
index fa6cb859b5a..00c5e8167d3 100644
--- a/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20231205140200_projects_inheriting_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_projects_inheriting_diffblue_cover_active.yml
index 807e771b4fd..9b82f9b4b89 100644
--- a/config/metrics/counts_all/20231205140200_projects_inheriting_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_projects_inheriting_diffblue_cover_active.yml
@@ -7,9 +7,6 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml b/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
index 4b60530f26f..058babc1400 100644
--- a/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml b/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
index 4b91e0f9790..56df2f07dbb 100644
--- a/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml b/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
index 0127dd46c66..6534af07167 100644
--- a/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml b/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
index 04f26d24b9b..042c947c4e8 100644
--- a/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml b/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
index 9a9b48ffbea..8a135c3cb23 100644
--- a/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240229180548_projects_phorge_active.yml b/config/metrics/counts_all/20240229180548_projects_phorge_active.yml
index f2a0035ecaf..8e8fd7f0914 100644
--- a/config/metrics/counts_all/20240229180548_projects_phorge_active.yml
+++ b/config/metrics/counts_all/20240229180548_projects_phorge_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240301170823_projects_inheriting_phorge_active.yml b/config/metrics/counts_all/20240301170823_projects_inheriting_phorge_active.yml
index 3af90f87666..e84736fdcd1 100644
--- a/config/metrics/counts_all/20240301170823_projects_inheriting_phorge_active.yml
+++ b/config/metrics/counts_all/20240301170823_projects_inheriting_phorge_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240301170844_instances_phorge_active.yml b/config/metrics/counts_all/20240301170844_instances_phorge_active.yml
index 31ef5cf3424..a6f54dec20c 100644
--- a/config/metrics/counts_all/20240301170844_instances_phorge_active.yml
+++ b/config/metrics/counts_all/20240301170844_instances_phorge_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240301170915_groups_phorge_active.yml b/config/metrics/counts_all/20240301170915_groups_phorge_active.yml
index 67fcd530523..174664e04ba 100644
--- a/config/metrics/counts_all/20240301170915_groups_phorge_active.yml
+++ b/config/metrics/counts_all/20240301170915_groups_phorge_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240301171403_groups_inheriting_phorge_active.yml b/config/metrics/counts_all/20240301171403_groups_inheriting_phorge_active.yml
index 6fc9f636a21..3ad065e2a0a 100644
--- a/config/metrics/counts_all/20240301171403_groups_inheriting_phorge_active.yml
+++ b/config/metrics/counts_all/20240301171403_groups_inheriting_phorge_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240703212603_projects_inheriting_jira_cloud_app_active.yml b/config/metrics/counts_all/20240703212603_projects_inheriting_jira_cloud_app_active.yml
index d199401b8b3..625a06f61eb 100644
--- a/config/metrics/counts_all/20240703212603_projects_inheriting_jira_cloud_app_active.yml
+++ b/config/metrics/counts_all/20240703212603_projects_inheriting_jira_cloud_app_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240703213642_groups_jira_cloud_app_active.yml b/config/metrics/counts_all/20240703213642_groups_jira_cloud_app_active.yml
index 5282ffc7def..dd9c68fc40c 100644
--- a/config/metrics/counts_all/20240703213642_groups_jira_cloud_app_active.yml
+++ b/config/metrics/counts_all/20240703213642_groups_jira_cloud_app_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240703214020_projects_jira_cloud_app_active.yml b/config/metrics/counts_all/20240703214020_projects_jira_cloud_app_active.yml
index da0f01c1629..8c854cafbe2 100644
--- a/config/metrics/counts_all/20240703214020_projects_jira_cloud_app_active.yml
+++ b/config/metrics/counts_all/20240703214020_projects_jira_cloud_app_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240703233053_groups_inheriting_jira_cloud_app_active.yml b/config/metrics/counts_all/20240703233053_groups_inheriting_jira_cloud_app_active.yml
index e4324970b36..821a9ebea47 100644
--- a/config/metrics/counts_all/20240703233053_groups_inheriting_jira_cloud_app_active.yml
+++ b/config/metrics/counts_all/20240703233053_groups_inheriting_jira_cloud_app_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240703233201_instances_jira_cloud_app_active.yml b/config/metrics/counts_all/20240703233201_instances_jira_cloud_app_active.yml
index 03704454060..b26fec7c933 100644
--- a/config/metrics/counts_all/20240703233201_instances_jira_cloud_app_active.yml
+++ b/config/metrics/counts_all/20240703233201_instances_jira_cloud_app_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240722124654_projects_inheriting_matrix_active.yml b/config/metrics/counts_all/20240722124654_projects_inheriting_matrix_active.yml
index 35dba55c5d1..74943171c8b 100644
--- a/config/metrics/counts_all/20240722124654_projects_inheriting_matrix_active.yml
+++ b/config/metrics/counts_all/20240722124654_projects_inheriting_matrix_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240722124725_groups_matrix_active.yml b/config/metrics/counts_all/20240722124725_groups_matrix_active.yml
index 44412b19226..e2453f2c9aa 100644
--- a/config/metrics/counts_all/20240722124725_groups_matrix_active.yml
+++ b/config/metrics/counts_all/20240722124725_groups_matrix_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240722124754_projects_matrix_active.yml b/config/metrics/counts_all/20240722124754_projects_matrix_active.yml
index f7d84e4d815..d9cc73e6e57 100644
--- a/config/metrics/counts_all/20240722124754_projects_matrix_active.yml
+++ b/config/metrics/counts_all/20240722124754_projects_matrix_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240722124827_groups_inheriting_matrix_active.yml b/config/metrics/counts_all/20240722124827_groups_inheriting_matrix_active.yml
index 56fa80c0d30..52f0799ec8d 100644
--- a/config/metrics/counts_all/20240722124827_groups_inheriting_matrix_active.yml
+++ b/config/metrics/counts_all/20240722124827_groups_inheriting_matrix_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20240722125029_instances_matrix_active.yml b/config/metrics/counts_all/20240722125029_instances_matrix_active.yml
index db16f42be10..b5db4750f8a 100644
--- a/config/metrics/counts_all/20240722125029_instances_matrix_active.yml
+++ b/config/metrics/counts_all/20240722125029_instances_matrix_active.yml
@@ -10,9 +10,6 @@ time_frame: all
 data_source: database
 data_category: optional
 performance_indicator_type: []
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/20241014113429_orphaned_namespaces.yml b/config/metrics/counts_all/20241014113429_orphaned_namespaces.yml
index 25b16a66edd..8459fe6f778 100644
--- a/config/metrics/counts_all/20241014113429_orphaned_namespaces.yml
+++ b/config/metrics/counts_all/20241014113429_orphaned_namespaces.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/168983
 time_frame: all
 data_source: database
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_distinct_user_id_from_g_project_management_issue_created.yml b/config/metrics/counts_all/count_distinct_user_id_from_g_project_management_issue_created.yml
index b178964aa9b..cd5aa03f670 100644
--- a/config/metrics/counts_all/count_distinct_user_id_from_g_project_management_issue_created.yml
+++ b/config/metrics/counts_all/count_distinct_user_id_from_g_project_management_issue_created.yml
@@ -9,9 +9,6 @@ time_frame: [7d, all]
 data_source: internal_events
 events:
   - name: create_ci_build
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_apply_wiki_template.yml b/config/metrics/counts_all/count_total_apply_wiki_template.yml
index ab01ca54c10..1d017f78b79 100644
--- a/config/metrics/counts_all/count_total_apply_wiki_template.yml
+++ b/config/metrics/counts_all/count_total_apply_wiki_template.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161130
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_asciidoc_wiki_page_created.yml b/config/metrics/counts_all/count_total_asciidoc_wiki_page_created.yml
index 61a47950278..9f0b0882ee7 100644
--- a/config/metrics/counts_all/count_total_asciidoc_wiki_page_created.yml
+++ b/config/metrics/counts_all/count_total_asciidoc_wiki_page_created.yml
@@ -13,9 +13,6 @@ events:
   - name: create_wiki_page
     filter:
       property: asciidoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_asciidoc_wiki_page_deleted.yml b/config/metrics/counts_all/count_total_asciidoc_wiki_page_deleted.yml
index fbcec6917e7..15a3e8fe468 100644
--- a/config/metrics/counts_all/count_total_asciidoc_wiki_page_deleted.yml
+++ b/config/metrics/counts_all/count_total_asciidoc_wiki_page_deleted.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_wiki_page
     filter:
       property: asciidoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_asciidoc_wiki_page_updated.yml b/config/metrics/counts_all/count_total_asciidoc_wiki_page_updated.yml
index cf998db1733..6316a46cb4d 100644
--- a/config/metrics/counts_all/count_total_asciidoc_wiki_page_updated.yml
+++ b/config/metrics/counts_all/count_total_asciidoc_wiki_page_updated.yml
@@ -13,9 +13,6 @@ events:
   - name: update_wiki_page
     filter:
       property: asciidoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml b/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
index 34695a2c088..5db80ba3219 100644
--- a/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
+++ b/config/metrics/counts_all/count_total_click_create_confidential_mr_issues_list.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143036
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml b/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
index da729d301f2..154f9877bc7 100644
--- a/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
+++ b/config/metrics/counts_all/count_total_click_create_mr_issues_list.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143036
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml b/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
index de8b518ab23..09ff17fa987 100644
--- a/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
+++ b/config/metrics/counts_all/count_total_click_new_merge_request_empty_list.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143036
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_new_merge_request_list.yml b/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
index 072c3d19b9a..9fae598ad85 100644
--- a/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
+++ b/config/metrics/counts_all/count_total_click_new_merge_request_list.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143036
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_print_as_pdf_in_wiki_page.yml b/config/metrics/counts_all/count_total_click_print_as_pdf_in_wiki_page.yml
index 839f2d29ba1..17dab48f875 100644
--- a/config/metrics/counts_all/count_total_click_print_as_pdf_in_wiki_page.yml
+++ b/config/metrics/counts_all/count_total_click_print_as_pdf_in_wiki_page.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161978
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_redact_text_button_repository_settings.yml b/config/metrics/counts_all/count_total_click_redact_text_button_repository_settings.yml
index ff982b234a9..d51e32f71b3 100644
--- a/config/metrics/counts_all/count_total_click_redact_text_button_repository_settings.yml
+++ b/config/metrics/counts_all/count_total_click_redact_text_button_repository_settings.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158034
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_click_remove_blob_button_repository_settings.yml b/config/metrics/counts_all/count_total_click_remove_blob_button_repository_settings.yml
index a83e2f09bc7..fced9d64e3e 100644
--- a/config/metrics/counts_all/count_total_click_remove_blob_button_repository_settings.yml
+++ b/config/metrics/counts_all/count_total_click_remove_blob_button_repository_settings.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158031
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_create_ci_build.yml b/config/metrics/counts_all/count_total_create_ci_build.yml
index 9580c9e667e..051a5ae2808 100644
--- a/config/metrics/counts_all/count_total_create_ci_build.yml
+++ b/config/metrics/counts_all/count_total_create_ci_build.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141421
 time_frame: all
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_create_ci_internal_pipeline.yml b/config/metrics/counts_all/count_total_create_ci_internal_pipeline.yml
index d4bdb3114ff..931364e83c4 100644
--- a/config/metrics/counts_all/count_total_create_ci_internal_pipeline.yml
+++ b/config/metrics/counts_all/count_total_create_ci_internal_pipeline.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142356
 time_frame: all
 data_source: internal_events
 data_category: operational
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_create_mr_web_ide.yml b/config/metrics/counts_all/count_total_create_mr_web_ide.yml
index 25f5f5f5293..e557a9d70ec 100644
--- a/config/metrics/counts_all/count_total_create_mr_web_ide.yml
+++ b/config/metrics/counts_all/count_total_create_mr_web_ide.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143036
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_create_pages_deployment.yml b/config/metrics/counts_all/count_total_create_pages_deployment.yml
index 1cb27a15167..897f749c2ee 100644
--- a/config/metrics/counts_all/count_total_create_pages_deployment.yml
+++ b/config/metrics/counts_all/count_total_create_pages_deployment.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157474
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_fallback_current_organization_to_default.yml b/config/metrics/counts_all/count_total_fallback_current_organization_to_default.yml
index e21e40ce847..7047626344d 100644
--- a/config/metrics/counts_all/count_total_fallback_current_organization_to_default.yml
+++ b/config/metrics/counts_all/count_total_fallback_current_organization_to_default.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172017
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_markdown_wiki_page_created.yml b/config/metrics/counts_all/count_total_markdown_wiki_page_created.yml
index 17d8971f6b7..64c34d744a1 100644
--- a/config/metrics/counts_all/count_total_markdown_wiki_page_created.yml
+++ b/config/metrics/counts_all/count_total_markdown_wiki_page_created.yml
@@ -13,9 +13,6 @@ events:
   - name: create_wiki_page
     filter:
       property: markdown
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_markdown_wiki_page_deleted.yml b/config/metrics/counts_all/count_total_markdown_wiki_page_deleted.yml
index 9c84d498285..37fd5cc2de3 100644
--- a/config/metrics/counts_all/count_total_markdown_wiki_page_deleted.yml
+++ b/config/metrics/counts_all/count_total_markdown_wiki_page_deleted.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_wiki_page
     filter:
       property: markdown
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_markdown_wiki_page_updated.yml b/config/metrics/counts_all/count_total_markdown_wiki_page_updated.yml
index 6bf5a000633..da619c3b032 100644
--- a/config/metrics/counts_all/count_total_markdown_wiki_page_updated.yml
+++ b/config/metrics/counts_all/count_total_markdown_wiki_page_updated.yml
@@ -13,9 +13,6 @@ events:
   - name: update_wiki_page
     filter:
       property: markdown
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
index 99ef8259a3c..1ad506e59d9 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
index 0669a4aa29d..7bca4088f7a 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
index 8d060f72362..b81c7b6066c 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
index 0728e4de53e..8683667d455 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141911
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_org_wiki_page_created.yml b/config/metrics/counts_all/count_total_org_wiki_page_created.yml
index 44e59db4207..5f954396ad4 100644
--- a/config/metrics/counts_all/count_total_org_wiki_page_created.yml
+++ b/config/metrics/counts_all/count_total_org_wiki_page_created.yml
@@ -13,9 +13,6 @@ events:
   - name: create_wiki_page
     filter:
       property: org
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_org_wiki_page_deleted.yml b/config/metrics/counts_all/count_total_org_wiki_page_deleted.yml
index b283473ff5c..6667f824a32 100644
--- a/config/metrics/counts_all/count_total_org_wiki_page_deleted.yml
+++ b/config/metrics/counts_all/count_total_org_wiki_page_deleted.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_wiki_page
     filter:
       property: org
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_org_wiki_page_updated.yml b/config/metrics/counts_all/count_total_org_wiki_page_updated.yml
index 96c090fc0ea..5ef0ede42cf 100644
--- a/config/metrics/counts_all/count_total_org_wiki_page_updated.yml
+++ b/config/metrics/counts_all/count_total_org_wiki_page_updated.yml
@@ -13,9 +13,6 @@ events:
   - name: update_wiki_page
     filter:
       property: org
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_rdoc_wiki_page_created.yml b/config/metrics/counts_all/count_total_rdoc_wiki_page_created.yml
index 948ec37f144..e6ca4ddc0bb 100644
--- a/config/metrics/counts_all/count_total_rdoc_wiki_page_created.yml
+++ b/config/metrics/counts_all/count_total_rdoc_wiki_page_created.yml
@@ -13,9 +13,6 @@ events:
   - name: create_wiki_page
     filter:
       property: rdoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_rdoc_wiki_page_deleted.yml b/config/metrics/counts_all/count_total_rdoc_wiki_page_deleted.yml
index 78ca3791dda..583649d2206 100644
--- a/config/metrics/counts_all/count_total_rdoc_wiki_page_deleted.yml
+++ b/config/metrics/counts_all/count_total_rdoc_wiki_page_deleted.yml
@@ -13,9 +13,6 @@ events:
   - name: delete_wiki_page
     filter:
       property: rdoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_rdoc_wiki_page_updated.yml b/config/metrics/counts_all/count_total_rdoc_wiki_page_updated.yml
index c2249dac611..97ff83bff6c 100644
--- a/config/metrics/counts_all/count_total_rdoc_wiki_page_updated.yml
+++ b/config/metrics/counts_all/count_total_rdoc_wiki_page_updated.yml
@@ -13,9 +13,6 @@ events:
   - name: update_wiki_page
     filter:
       property: rdoc
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_show_client_side_secret_detection_warning.yml b/config/metrics/counts_all/count_total_show_client_side_secret_detection_warning.yml
index e643ef524aa..379ade4f066 100644
--- a/config/metrics/counts_all/count_total_show_client_side_secret_detection_warning.yml
+++ b/config/metrics/counts_all/count_total_show_client_side_secret_detection_warning.yml
@@ -10,9 +10,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161119
 time_frame: all
 data_source: internal_events
 data_category: optional
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_wiki_page_templates_created.yml b/config/metrics/counts_all/count_total_wiki_page_templates_created.yml
index 6fc1fa5400a..ff6edb6df5e 100644
--- a/config/metrics/counts_all/count_total_wiki_page_templates_created.yml
+++ b/config/metrics/counts_all/count_total_wiki_page_templates_created.yml
@@ -11,9 +11,6 @@ events:
   - name: create_wiki_page
     filter:
       label: template
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_wiki_page_templates_deleted.yml b/config/metrics/counts_all/count_total_wiki_page_templates_deleted.yml
index 7a712b79b18..a4fefcff34e 100644
--- a/config/metrics/counts_all/count_total_wiki_page_templates_deleted.yml
+++ b/config/metrics/counts_all/count_total_wiki_page_templates_deleted.yml
@@ -11,9 +11,6 @@ events:
   - name: delete_wiki_page
     filter:
       label: template
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/count_total_wiki_page_templates_updated.yml b/config/metrics/counts_all/count_total_wiki_page_templates_updated.yml
index 4e0422907fa..f88b45a3d9f 100644
--- a/config/metrics/counts_all/count_total_wiki_page_templates_updated.yml
+++ b/config/metrics/counts_all/count_total_wiki_page_templates_updated.yml
@@ -11,9 +11,6 @@ events:
   - name: update_wiki_page
     filter:
       label: template
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/config/metrics/counts_all/slack_app_installations.yml b/config/metrics/counts_all/slack_app_installations.yml
index b9169dc69d6..3a7463e8a74 100644
--- a/config/metrics/counts_all/slack_app_installations.yml
+++ b/config/metrics/counts_all/slack_app_installations.yml
@@ -8,9 +8,6 @@ status: active
 time_frame: [28d, 7d]
 data_source: database
 instrumentation_class: CountSlackAppInstallationsMetric
-distribution:
-- ce
-- ee
 tiers:
 - free
 - premium
diff --git a/db/docs/dora_daily_metrics.yml b/db/docs/dora_daily_metrics.yml
index cdf19e3b90f..51e0b0b3cfd 100644
--- a/db/docs/dora_daily_metrics.yml
+++ b/db/docs/dora_daily_metrics.yml
@@ -9,14 +9,6 @@ description: Stores daily snapshots of DORA4 metrics per environment.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55473
 milestone: '13.10'
 gitlab_schema: gitlab_main_cell
-desired_sharding_key:
-  project_id:
-    references: projects
-    backfill_via:
-      parent:
-        foreign_key: environment_id
-        table: environments
-        sharding_key: project_id
-        belongs_to: environment
-desired_sharding_key_migration_job_name: BackfillDoraDailyMetricsProjectId
 table_size: small
+sharding_key:
+  project_id: projects
diff --git a/db/docs/vulnerability_user_mentions.yml b/db/docs/vulnerability_user_mentions.yml
index e1bfd1623f6..c5e24470d6b 100644
--- a/db/docs/vulnerability_user_mentions.yml
+++ b/db/docs/vulnerability_user_mentions.yml
@@ -8,14 +8,6 @@ description: Stores notes for a given vulnerability
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27515
 milestone: '13.0'
 gitlab_schema: gitlab_sec
-desired_sharding_key:
-  project_id:
-    references: projects
-    backfill_via:
-      parent:
-        foreign_key: vulnerability_id
-        table: vulnerabilities
-        sharding_key: project_id
-        belongs_to: vulnerability
-desired_sharding_key_migration_job_name: BackfillVulnerabilityUserMentionsProjectId
 table_size: small
+sharding_key:
+  project_id: projects
diff --git a/db/post_migrate/20250109053324_add_dora_daily_metrics_project_id_not_null_constraint.rb b/db/post_migrate/20250109053324_add_dora_daily_metrics_project_id_not_null_constraint.rb
new file mode 100644
index 00000000000..8e9fe70bf77
--- /dev/null
+++ b/db/post_migrate/20250109053324_add_dora_daily_metrics_project_id_not_null_constraint.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddDoraDailyMetricsProjectIdNotNullConstraint < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+  milestone '17.9'
+
+  def up
+    add_not_null_constraint :dora_daily_metrics, :project_id
+  end
+
+  def down
+    remove_not_null_constraint :dora_daily_metrics, :project_id
+  end
+end
diff --git a/db/post_migrate/20250109073325_add_vulnerability_user_mentions_project_id_not_null_constraint.rb b/db/post_migrate/20250109073325_add_vulnerability_user_mentions_project_id_not_null_constraint.rb
new file mode 100644
index 00000000000..3506e14c9e3
--- /dev/null
+++ b/db/post_migrate/20250109073325_add_vulnerability_user_mentions_project_id_not_null_constraint.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddVulnerabilityUserMentionsProjectIdNotNullConstraint < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+  milestone '17.9'
+
+  def up
+    add_not_null_constraint :vulnerability_user_mentions, :project_id
+  end
+
+  def down
+    remove_not_null_constraint :vulnerability_user_mentions, :project_id
+  end
+end
diff --git a/db/schema_migrations/20250109053324 b/db/schema_migrations/20250109053324
new file mode 100644
index 00000000000..76714d470ca
--- /dev/null
+++ b/db/schema_migrations/20250109053324
@@ -0,0 +1 @@
+1c8d0e68b419f0128296acd657a60ebe83c3330f027433352111f28caefc26fd
\ No newline at end of file
diff --git a/db/schema_migrations/20250109073325 b/db/schema_migrations/20250109073325
new file mode 100644
index 00000000000..53442b6ba76
--- /dev/null
+++ b/db/schema_migrations/20250109073325
@@ -0,0 +1 @@
+f5dd9dfc14572d56f94bb2971e647544d0470e3e81ba5c1d6bcf0f82f15d4b0b
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 0e335d7b44a..26c654987dd 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12500,6 +12500,7 @@ CREATE TABLE dora_daily_metrics (
     time_to_restore_service_in_seconds integer,
     incidents_count integer,
     project_id bigint,
+    CONSTRAINT check_25a1971e50 CHECK ((project_id IS NOT NULL)),
     CONSTRAINT dora_daily_metrics_deployment_frequency_positive CHECK ((deployment_frequency >= 0)),
     CONSTRAINT dora_daily_metrics_lead_time_for_changes_in_seconds_positive CHECK ((lead_time_for_changes_in_seconds >= 0))
 );
@@ -22916,7 +22917,8 @@ CREATE TABLE vulnerability_user_mentions (
     mentioned_projects_ids bigint[],
     mentioned_groups_ids bigint[],
     note_id bigint,
-    project_id bigint
+    project_id bigint,
+    CONSTRAINT check_0105942303 CHECK ((project_id IS NOT NULL))
 );
 
 CREATE SEQUENCE vulnerability_user_mentions_id_seq
diff --git a/doc/administration/self_hosted_models/supported_llm_serving_platforms.md b/doc/administration/self_hosted_models/supported_llm_serving_platforms.md
index 99343999fa2..4b779adf1d4 100644
--- a/doc/administration/self_hosted_models/supported_llm_serving_platforms.md
+++ b/doc/administration/self_hosted_models/supported_llm_serving_platforms.md
@@ -45,7 +45,9 @@ There are multiple platforms available to host your self-hosted Large Language M
 
 1. [AWS Bedrock](https://aws.amazon.com/bedrock/).
    A fully managed service that allows developers to build and scale generative AI applications using pre-trained models from leading AI companies. It seamlessly integrates with other AWS services and offers a pay-as-you-go pricing model.
-   - [AWS Bedrock Model Deployment Guide](https://docs.epam-rail.com/Deployment/Bedrock%20Model%20Deployment)
+
+   You must configure the GitLab instance with your appropriate AWS IAM permissions before accessing Bedrock models. You cannot do this in the self-hosted models UI. For example, you can authenticate the AI Gateway instance by defining the [`AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION_NAME`](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html) when starting the Docker image. For more information, see the [AWS Identity and Access Management (IAM) Guide](https://docs.aws.amazon.com/bedrock/latest/userguide/security-iam.html).
+
    - [Supported foundation models in Amazon Bedrock](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html)
 
 1. [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/).
diff --git a/doc/api/bulk_imports.md b/doc/api/bulk_imports.md
index 4077ede5d97..04a2fd7c19e 100644
--- a/doc/api/bulk_imports.md
+++ b/doc/api/bulk_imports.md
@@ -52,7 +52,9 @@ POST /bulk_imports
 | `entities[migrate_memberships]`   | Boolean | no      | Import user memberships. Defaults to `true`. |
 
 ```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token_for_destination_gitlab_instance>" "https://destination-gitlab-instance.example.com/api/v4/bulk_imports" \
+curl --request POST \
+  --url "https://destination-gitlab-instance.example.com/api/v4/bulk_imports" \
+  --header "PRIVATE-TOKEN: <your_access_token_for_destination_gitlab_instance>" \
   --header "Content-Type: application/json" \
   --data '{
     "configuration": {
@@ -103,7 +105,9 @@ The status can be one of the following:
 - `failed`
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports?per_page=2&page=1"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports?per_page=2&page=1"
 ```
 
 ```json
@@ -150,7 +154,9 @@ The status can be one of the following:
 - `failed`
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/entities?per_page=2&page=1&status=started"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/entities?per_page=2&page=1&status=started"
 ```
 
 ```json
@@ -229,7 +235,9 @@ GET /bulk_imports/:id
 ```
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/1"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/1"
 ```
 
 ```json
@@ -264,7 +272,9 @@ The status can be one of the following:
 - `failed`
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/1/entities?per_page=2&page=1&status=finished"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/1/entities?per_page=2&page=1&status=finished"
 ```
 
 ```json
@@ -322,7 +332,9 @@ GET /bulk_imports/:id/entities/:entity_id
 ```
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/1/entities/2"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/1/entities/2"
 ```
 
 ```json
@@ -380,7 +392,9 @@ GET /bulk_imports/:id/entities/:entity_id/failures
 ```
 
 ```shell
-curl --request GET --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/1/entities/2/failures"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/1/entities/2/failures"
 ```
 
 ```json
@@ -405,7 +419,9 @@ POST /bulk_imports/:id/cancel
 ```
 
 ```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/bulk_imports/1/cancel"
+curl --request POST \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/bulk_imports/1/cancel"
 ```
 
 ```json
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index e23dd361d1d..edd06d4eca7 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -144,8 +144,10 @@ four standard [pagination arguments](#pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="queryaimessagesagentversionid"></a>`agentVersionId` | [`AiAgentVersionID`](#aiagentversionid) | Global ID of the agent to answer the chat. |
+| <a id="queryaimessagesconversationtype"></a>`conversationType` | [`AiConversationsThreadsConversationType`](#aiconversationsthreadsconversationtype) | Conversation type of the thread. |
 | <a id="queryaimessagesrequestids"></a>`requestIds` | [`[ID!]`](#id) | Array of request IDs to fetch. |
 | <a id="queryaimessagesroles"></a>`roles` | [`[AiMessageRole!]`](#aimessagerole) | Array of roles to fetch. |
+| <a id="queryaimessagesthreadid"></a>`threadId` | [`AiConversationThreadID`](#aiconversationthreadid) | Global Id of the existing thread.If it is not specified, the last thread for the specified conversation_type will be retrieved. |
 
 ### `Query.aiSelfHostedModels`
 
@@ -1766,6 +1768,7 @@ Input type: `AiActionInput`
 | <a id="mutationaiactionchat"></a>`chat` | [`AiChatInput`](#aichatinput) | Input for chat AI action. |
 | <a id="mutationaiactionclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
 | <a id="mutationaiactionclientsubscriptionid"></a>`clientSubscriptionId` | [`String`](#string) | Client generated ID that can be subscribed to, to receive a response for the mutation. |
+| <a id="mutationaiactionconversationtype"></a>`conversationType` | [`AiConversationsThreadsConversationType`](#aiconversationsthreadsconversationtype) | Conversation type of the thread. |
 | <a id="mutationaiactionexplainvulnerability"></a>`explainVulnerability` | [`AiExplainVulnerabilityInput`](#aiexplainvulnerabilityinput) | Input for explain_vulnerability AI action. |
 | <a id="mutationaiactiongeneratecommitmessage"></a>`generateCommitMessage` | [`AiGenerateCommitMessageInput`](#aigeneratecommitmessageinput) | Input for generate_commit_message AI action. |
 | <a id="mutationaiactiongeneratecubequery"></a>`generateCubeQuery` | [`AiGenerateCubeQueryInput`](#aigeneratecubequeryinput) | Input for generate_cube_query AI action. |
@@ -1777,6 +1780,7 @@ Input type: `AiActionInput`
 | <a id="mutationaiactionsummarizecomments"></a>`summarizeComments` | [`AiSummarizeCommentsInput`](#aisummarizecommentsinput) | Input for summarize_comments AI action. |
 | <a id="mutationaiactionsummarizenewmergerequest"></a>`summarizeNewMergeRequest` | [`AiSummarizeNewMergeRequestInput`](#aisummarizenewmergerequestinput) | Input for summarize_new_merge_request AI action. |
 | <a id="mutationaiactionsummarizereview"></a>`summarizeReview` | [`AiSummarizeReviewInput`](#aisummarizereviewinput) | Input for summarize_review AI action. |
+| <a id="mutationaiactionthreadid"></a>`threadId` | [`AiConversationThreadID`](#aiconversationthreadid) | Global Id of the existing thread to continue the conversation. If it is not specified, a new thread will be created for the specified conversation_type. |
 
 #### Fields
 
@@ -1785,6 +1789,7 @@ Input type: `AiActionInput`
 | <a id="mutationaiactionclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
 | <a id="mutationaiactionerrors"></a>`errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. |
 | <a id="mutationaiactionrequestid"></a>`requestId` | [`String`](#string) | ID of the request. |
+| <a id="mutationaiactionthreadid"></a>`threadId` | [`AiConversationThreadID`](#aiconversationthreadid) | Global Id of the thread. |
 
 ### `Mutation.aiAgentCreate`
 
@@ -38746,6 +38751,14 @@ The category of the additional context.
 | <a id="aiadditionalcontextcategorymerge_request"></a>`MERGE_REQUEST` | Merge_request content category. |
 | <a id="aiadditionalcontextcategorysnippet"></a>`SNIPPET` | Snippet content category. |
 
+### `AiConversationsThreadsConversationType`
+
+Conversation type of the thread.
+
+| Value | Description |
+| ----- | ----------- |
+| <a id="aiconversationsthreadsconversationtypeduo_chat"></a>`DUO_CHAT` | duo_chat thread. |
+
 ### `AiFeatureProviders`
 
 Providers for AI features that can be configured.
@@ -42351,6 +42364,12 @@ A `AiAgentVersionID` is a global ID. It is encoded as a string.
 
 An example `AiAgentVersionID` is: `"gid://gitlab/Ai::AgentVersion/1"`.
 
+### `AiConversationThreadID`
+
+A `AiConversationThreadID` is a global ID. It is encoded as a string.
+
+An example `AiConversationThreadID` is: `"gid://gitlab/Ai::Conversation::Thread/1"`.
+
 ### `AiDuoWorkflowsWorkflowID`
 
 A `AiDuoWorkflowsWorkflowID` is a global ID. It is encoded as a string.
diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md
index f8412442292..5caf421f7b7 100644
--- a/doc/api/namespaces.md
+++ b/doc/api/namespaces.md
@@ -14,35 +14,29 @@ Use this API to interact with namespaces, a special resource category used to or
 
 This API uses [Pagination](rest/index.md#pagination) to filter results.
 
-You might also want to view documentation for:
-
-- [Users](users.md)
-- [Groups](groups.md)
-
-## List namespaces
+## List all namespaces
 
 > - `top_level_only` [introduced](https://gitlab.com/gitlab-org/customers-gitlab-com/-/issues/7600) in GitLab 16.8.
 
-Get a list of the namespaces of the authenticated user. If the user is an
-administrator, a list of all namespaces in the GitLab instance is shown.
+Lists all namespaces available to the current user. If the user is an
+administrator, this endpoint returns all namespaces in the instance.
 
 ```plaintext
 GET /namespaces
-GET /namespaces?search=foobar
-GET /namespaces?owned_only=true
-GET /namespaces?top_level_only=true
 ```
 
 | Attribute        | Type    | Required | Description |
 | ---------------- | ------- | -------- | ----------- |
-| `search`         | string  | no       | Returns a list of namespaces the user is authorized to view based on the search criteria |
-| `owned_only`     | boolean | no       | Returns a list of owned namespaces only |
-| `top_level_only` | boolean | no       | In GitLab 16.8 and later, returns a list of top level namespaces only |
+| `search`         | string  | no       | Only returns namespaces accessible by the current user. |
+| `owned_only`     | boolean | no       | If `true`, only returns namespaces by the current user. |
+| `top_level_only` | boolean | no       | In GitLab 16.8 and later, if `true`, only returns top-level namespaces. |
 
 Example request:
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/namespaces"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/namespaces"
 ```
 
 Example response:
@@ -59,7 +53,7 @@ Example response:
     "avatar_url": "https://secure.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
     "web_url": "https://gitlab.example.com/user1",
     "billable_members_count": 1,
-    "plan": "default",
+    "plan": "ultimate",
     "end_date": null,
     "trial_ends_on": null,
     "trial": false,
@@ -77,7 +71,7 @@ Example response:
     "web_url": "https://gitlab.example.com/groups/group1",
     "members_count_with_descendants": 2,
     "billable_members_count": 2,
-    "plan": "default",
+    "plan": "ultimate",
     "end_date": null,
     "trial_ends_on": null,
     "trial": false,
@@ -95,57 +89,36 @@ Example response:
     "web_url": "https://gitlab.example.com/groups/foo/bar",
     "members_count_with_descendants": 5,
     "billable_members_count": 5,
-    "plan": "default",
     "end_date": null,
     "trial_ends_on": null,
     "trial": false,
     "root_repository_size": 100,
     "projects_count": 3
   }
-    "projects_count": 3
 ]
 ```
 
-Owners also see the `plan` property associated with a namespace:
+Additional attributes might be returned for Group owners or on GitLab.com:
 
 ```json
 [
   {
-    "id": 1,
-    "name": "user1",
-    "plan": "silver",
     ...
-  }
-]
-```
-
-Users on GitLab.com also see `max_seats_used`, `seats_in_use` and `max_seats_used_changed_at` parameters.
-`max_seats_used` is the highest number of users the group had. `seats_in_use` is
-the number of license seats currently being used. `max_seats_used_changed_at` shows the date when the `max_seats_used` value changed. All the values are updated
-once a day.
-
-`max_seats_used` and `seats_in_use` are non-zero only for namespaces on paid plans.
-
-```json
-[
-  {
-    "id": 1,
-    "name": "user1",
-    "billable_members_count": 2,
     "max_seats_used": 3,
-    "max_seats_used_changed_at":"2023-02-13T12:00:02.000Z",
+    "max_seats_used_changed_at":"2025-05-15T12:00:02.000Z",
     "seats_in_use": 2,
+    "projects_count": 1,
+    "root_repository_size":0,
+    "members_count_with_descendants":26,
+    "plan": "free",
     ...
   }
 ]
 ```
 
-NOTE:
-Only group owners are presented with `members_count_with_descendants`, `root_repository_size`, `projects_count` and `plan`.
+## Get details on a namespace
 
-## Get namespace by ID
-
-Get a namespace by ID.
+Gets details on a specified namespace.
 
 ```plaintext
 GET /namespaces/:id
@@ -153,12 +126,14 @@ GET /namespaces/:id
 
 | Attribute | Type           | Required | Description |
 | --------- | -------------- | -------- | ----------- |
-| `id`      | integer/string | yes      | ID or [URL-encoded path of the namespace](rest/index.md#namespaced-paths) |
+| `id`      | integer/string | yes      | ID or [URL-encoded path](rest/index.md#namespaced-paths) of the namespace. |
 
 Example request:
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/namespaces/2"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/namespaces/2"
 ```
 
 Example response:
@@ -216,9 +191,9 @@ Example response:
 }
 ```
 
-## Get existence of a namespace
+## Verify namespace availability
 
-Get existence of a namespace by path. Suggests a new namespace path that does not already exist.
+Verifies if a specified namespace already exists. If the namespace does exist, the endpoint suggests an alternate name.
 
 ```plaintext
 GET /namespaces/:namespace/exists
@@ -226,13 +201,15 @@ GET /namespaces/:namespace/exists
 
 | Attribute   | Type    | Required | Description |
 | ----------- | ------- | -------- | ----------- |
-| `namespace` | string  | yes      | Namespace's path. |
-| `parent_id` | integer | no       | The ID of the parent namespace. If no ID is specified, only top-level namespaces are considered. |
+| `namespace` | string  | yes      | Path of the namespace. |
+| `parent_id` | integer | no       | ID of the parent namespace. If unspecified, only returns top-level namespaces. |
 
 Example request:
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/namespaces/my-group/exists?parent_id=1"
+curl --request GET \
+  --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/namespaces/my-group/exists?parent_id=1"
 ```
 
 Example response:
diff --git a/doc/user/group/import/direct_transfer_migrations.md b/doc/user/group/import/direct_transfer_migrations.md
index 6dea3407886..d70cb212921 100644
--- a/doc/user/group/import/direct_transfer_migrations.md
+++ b/doc/user/group/import/direct_transfer_migrations.md
@@ -80,12 +80,13 @@ DETAILS:
 > - Mapping of shared and inherited shared members as direct members was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129017) in GitLab 16.3.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/148220) in GitLab 16.11, shared and inherited shared members are no longer mapped as direct members if they are already shared or inherited shared members of the imported group or project.
 > - Full support for mapping inherited membership [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/458834) in GitLab 17.1.
-> - Removed from GitLab.com direct transfer migrations in GitLab 17.5 in favor of [the alternative](../../project/import/index.md#user-contribution-and-membership-mapping).
+> - Removed from direct transfer on GitLab.com in GitLab 17.5 in favor of [the alternative](../../project/import/index.md#user-contribution-and-membership-mapping).
+> - Removed as the default direct transfer method on GitLab Self-Managed and GitLab Dedicated in GitLab 17.7 in favor of [the alternative](../../project/import/index.md#user-contribution-and-membership-mapping).
 
 This method of user contribution and membership mapping is available for
-GitLab Self-Managed without enabled feature flags.
-For information on the other method available for GitLab Self-Managed
-with enabled feature flags and for GitLab.com,
+GitLab Self-Managed when `importer_user_mapping` and `bulk_import_importer_user_mapping` are disabled.
+These feature flags are enabled by default.
+For information on the default method available for GitLab Self-Managed and GitLab.com,
 see [user contribution and membership mapping](../../project/import/index.md#user-contribution-and-membership-mapping).
 
 Users are never created during a migration. Instead, contributions and membership of users on the source instance are
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index f8e91f109ad..38df7f2e09d 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -99,15 +99,14 @@ For more information, see the history.
 NOTE:
 To leave feedback about this feature, add a comment to [issue 502565](https://gitlab.com/gitlab-org/gitlab/-/issues/502565).
 
-This method of user contribution and membership mapping is available for
-[direct transfer migrations](../../group/import/index.md), [GitHub importer](github.md), [Bitbucket Server importer](bitbucket_server.md), and [Gitea importer](gitea.md) on:
-
-- GitLab.com
-- GitLab Self-Managed when two feature flags are enabled
+This method of user contribution and membership mapping is available by default for
+[direct transfer](../../group/import/index.md), [GitHub importer](github.md),
+[Bitbucket Server importer](bitbucket_server.md), and [Gitea importer](gitea.md) on
+GitLab.com and GitLab Self-Managed.
+For information on the other method available for GitLab Self-Managed with disabled feature flags,
+see the documentation for each importer.
 
 User contribution mapping is not supported when you import projects to a personal namespace.
-For information on the other method available for GitLab Self-Managed without enabled feature flags,
-see [user contribution and membership mapping](../../group/import/direct_transfer_migrations.md#user-contribution-and-membership-mapping).
 
 Any memberships and contributions you import are first mapped to [placeholder users](#placeholder-users).
 These placeholders are created on the destination instance even if
diff --git a/spec/features/dashboard/archived_projects_spec.rb b/spec/features/dashboard/archived_projects_spec.rb
index 241ef3544cc..e63ce2f1c60 100644
--- a/spec/features/dashboard/archived_projects_spec.rb
+++ b/spec/features/dashboard/archived_projects_spec.rb
@@ -14,34 +14,70 @@ RSpec.describe 'Dashboard Archived Project', feature_category: :groups_and_proje
     archived_project_2.add_maintainer(user)
   end
 
-  before do
-    sign_in(user)
+  context 'when feature flag your_work_projects_vue is enabled', :js do
+    before do
+      sign_in(user)
 
-    visit dashboard_projects_path
+      visit member_dashboard_projects_path
+      wait_for_requests
+    end
+
+    it 'renders non archived projects' do
+      expect(page).to have_link(project.name)
+      expect(page).not_to have_link(archived_project.name)
+    end
+
+    it 'renders only archived projects' do
+      click_link 'Inactive'
+
+      expect(page).to have_content(archived_project.name)
+      expect(page).not_to have_content(project.name)
+    end
+
+    it 'searches archived projects', :js do
+      click_link 'Inactive'
+
+      expect(page).to have_link(archived_project.name)
+      expect(page).to have_link(archived_project_2.name)
+
+      search(archived_project.name)
+
+      expect(page).not_to have_link(archived_project_2.name)
+      expect(page).to have_link(archived_project.name)
+    end
   end
 
-  it 'renders non archived projects' do
-    expect(page).to have_link(project.name)
-    expect(page).not_to have_link(archived_project.name)
-  end
+  context 'when feature flag your_work_projects_vue is disabled' do
+    before do
+      stub_feature_flags(your_work_projects_vue: false)
+      sign_in(user)
 
-  it 'renders only archived projects' do
-    click_link 'Inactive'
+      visit dashboard_projects_path
+    end
 
-    expect(page).to have_content(archived_project.name)
-    expect(page).not_to have_content(project.name)
-  end
+    it 'renders non archived projects' do
+      expect(page).to have_link(project.name)
+      expect(page).not_to have_link(archived_project.name)
+    end
 
-  it 'searches archived projects', :js do
-    click_link 'Inactive'
+    it 'renders only archived projects' do
+      click_link 'Inactive'
 
-    expect(page).to have_link(archived_project.name)
-    expect(page).to have_link(archived_project_2.name)
+      expect(page).to have_content(archived_project.name)
+      expect(page).not_to have_content(project.name)
+    end
 
-    search(archived_project.name)
+    it 'searches archived projects', :js do
+      click_link 'Inactive'
 
-    expect(page).not_to have_link(archived_project_2.name)
-    expect(page).to have_link(archived_project.name)
+      expect(page).to have_link(archived_project.name)
+      expect(page).to have_link(archived_project_2.name)
+
+      search(archived_project.name)
+
+      expect(page).not_to have_link(archived_project_2.name)
+      expect(page).to have_link(archived_project.name)
+    end
   end
 
   def search(term)
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index c5758e5d743..f2a956f36c6 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -13,16 +13,243 @@ RSpec.describe 'Dashboard Projects', :js, feature_category: :groups_and_projects
   end
 
   context 'when feature :your_work_projects_vue is enabled' do
-    before do
-      stub_feature_flags(your_work_projects_vue: true)
-    end
+    let_it_be(:personal_project) { create(:project, namespace: user.namespace) }
+    let_it_be(:personal_project_with_stars) { create(:project, namespace: user.namespace, star_count: 10) }
+    let_it_be(:pipeline) { create(:ci_pipeline, :success, project: project, sha: project.commit.sha, ref: project.default_branch) }
 
     it 'mounts JS app and defaults to contributed tab' do
       visit dashboard_projects_path
+      wait_for_requests
 
       expect(page).to have_content('Projects')
       expect(page).to have_selector('a[aria-selected="true"]', text: 'Contributed')
     end
+
+    it_behaves_like "an autodiscoverable RSS feed with current_user's feed token" do
+      before do
+        visit dashboard_projects_path
+        wait_for_requests
+      end
+    end
+
+    it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :dashboard_projects_path, :projects
+
+    it 'links to the "Explore projects" page' do
+      visit dashboard_projects_path
+      wait_for_requests
+
+      expect(page).to have_link("Explore projects", href: starred_explore_projects_path)
+    end
+
+    context 'when user has access to the project' do
+      it 'shows role badge' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project.id}") do
+          expect(find_by_testid('access-level-badge')).to have_content('Developer')
+        end
+      end
+    end
+
+    context 'when last_activity_at and update_at are present' do
+      let_it_be(:project_with_last_activity) do
+        create(
+          :project,
+          namespace: user.namespace,
+          last_repository_updated_at: 1.hour.ago,
+          last_activity_at: Time.zone.now
+        )
+      end
+
+      it 'shows the last_activity_at attribute as the update date' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project_with_last_activity.id}") do
+          expect(page).to have_xpath("//time[@datetime='#{project_with_last_activity.last_activity_at.getutc.iso8601}']")
+        end
+      end
+    end
+
+    context 'when last_activity_at is missing' do
+      it 'shows the updated_at attribute as the update date' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project.id}") do
+          expect(page).to have_xpath("//time[@datetime='#{project.updated_at.getutc.iso8601}']")
+        end
+      end
+    end
+
+    it 'shows personal projects on personal projects tab' do
+      visit personal_dashboard_projects_path
+      wait_for_requests
+
+      expect(page).not_to have_content(project.name)
+      expect(page).to have_content(personal_project.name)
+    end
+
+    it 'sorts projects by most stars when sorting by most stars' do
+      visit personal_dashboard_projects_path(sort: :stars_desc)
+      wait_for_requests
+
+      expect(first('[data-testid*="projects-list-item"]')).to have_content(personal_project_with_stars.title)
+    end
+
+    context 'when on Member projects tab' do
+      it 'shows all projects you are a member of' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        expect(page).to have_content(project.name)
+        expect(page).to have_content(personal_project.name)
+        expect(page).to have_content(personal_project_with_stars.name)
+        expect(find('a[aria-selected="true"]')).to have_content('3')
+      end
+    end
+
+    context 'when on Starred projects tab' do
+      it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :starred_dashboard_projects_path, :projects
+
+      it 'shows the empty state when there are no starred projects' do
+        visit(starred_dashboard_projects_path)
+        wait_for_requests
+
+        expect(page).to have_text("You don't have any projects yet.")
+      end
+
+      it 'shows only starred projects' do
+        user.toggle_star(project2)
+
+        visit(starred_dashboard_projects_path)
+        wait_for_requests
+
+        expect(page).not_to have_content(project.name)
+        expect(page).to have_content(project2.name)
+        expect(find('a[aria-selected="true"]')).to have_content('1')
+      end
+    end
+
+    describe 'with a pipeline' do
+      it 'shows that the last pipeline passed' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project.id}") do
+          expect(page).to have_css("[data-testid='ci-icon']")
+          expect(page).to have_css('[data-testid="status_success_borderless-icon"]')
+          expect(page).to have_link('Status: Passed')
+        end
+      end
+
+      context 'guest user of project and project has private pipelines' do
+        let_it_be(:guest_user) { create(:user) }
+        let_it_be(:project_with_private_pipelines) { create(:project, namespace: user.namespace, public_builds: false) }
+
+        before_all do
+          project_with_private_pipelines.add_guest(guest_user)
+        end
+
+        before do
+          sign_in(guest_user)
+        end
+
+        it 'does not show the pipeline status' do
+          visit member_dashboard_projects_path
+          wait_for_requests
+
+          within_testid("projects-list-item-#{project_with_private_pipelines.id}") do
+            expect(page).not_to have_css("[data-testid='ci-icon']")
+          end
+        end
+      end
+
+      context "when last_pipeline is missing" do
+        it 'does not show the pipeline status' do
+          visit member_dashboard_projects_path
+          wait_for_requests
+
+          within_testid("projects-list-item-#{personal_project.id}") do
+            expect(page).not_to have_css("[data-testid='ci-icon']")
+          end
+        end
+      end
+    end
+
+    context 'when project has topics' do
+      let_it_be(:project_with_topics) { create(:project, namespace: user.namespace, topic_list: 'topic1') }
+
+      it 'shows project topics' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project_with_topics.id}") do
+          expect(page).to have_link('topic1', href: topic_explore_projects_path(topic_name: 'topic1'))
+        end
+      end
+    end
+
+    context 'when project does not have topics' do
+      it 'does not show project topics' do
+        visit member_dashboard_projects_path
+        wait_for_requests
+
+        within_testid("projects-list-item-#{project.id}") do
+          expect(page).not_to have_selector('[data-testid="project-topics"]')
+        end
+      end
+    end
+
+    context 'last push widget', :use_clean_rails_memory_store_caching do
+      before do
+        event = create(:push_event, project: project, author: user)
+
+        create(:push_event_payload, event: event, ref: 'feature', action: :created)
+
+        Users::LastPushEventService.new(user).cache_last_push_event(event)
+
+        visit dashboard_projects_path
+      end
+
+      it 'shows "Create merge request" button' do
+        expect(page).to have_content 'You pushed to feature'
+
+        within('#content-body') do
+          find_link('Create merge request', visible: false).click
+        end
+
+        expect(page).to have_selector('.merge-request-form')
+        expect(page).to have_current_path project_new_merge_request_path(project), ignore_query: true
+        expect(find('#merge_request_target_project_id', visible: false).value).to eq project.id.to_s
+        expect(page).to have_content "From feature into master"
+      end
+    end
+
+    it 'avoids an N+1 query in dashboard index' do
+      visit member_dashboard_projects_path
+      wait_for_requests
+
+      control = ActiveRecord::QueryRecorder.new do
+        visit member_dashboard_projects_path
+        wait_for_requests
+      end
+
+      new_project = create(:project, :repository, name: 'new project')
+      create(:ci_pipeline, :with_job, status: :success, project: new_project, ref: new_project.commit.sha)
+      new_project.add_developer(user)
+
+      # There are a few known N+1 queries: https://gitlab.com/gitlab-org/gitlab/-/issues/214037
+      # - User#max_member_access_for_project_ids
+      # - ProjectsHelper#load_pipeline_status / Ci::CommitWithPipeline#last_pipeline
+      # - Ci::Pipeline#detailed_status
+
+      expect do
+        visit member_dashboard_projects_path
+        wait_for_requests
+      end.not_to exceed_query_limit(control).with_threshold(4)
+    end
   end
 
   context 'when feature :your_work_projects_vue is disabled' do
@@ -147,12 +374,6 @@ RSpec.describe 'Dashboard Projects', :js, feature_category: :groups_and_projects
         expect(find('.gl-tabs-nav li:nth-child(1) .badge-pill')).to have_content(1)
         expect(find('.gl-tabs-nav li:nth-child(2) .badge-pill')).to have_content(1)
       end
-
-      it 'does not show tabs to filter by all projects or personal' do
-        visit(starred_dashboard_projects_path)
-
-        expect(page).not_to have_content '.filtered-search-nav'
-      end
     end
 
     describe 'with a pipeline', :clean_gitlab_redis_shared_state do
diff --git a/spec/features/dashboard/user_filters_projects_spec.rb b/spec/features/dashboard/user_filters_projects_spec.rb
index 054b339f47d..f23fcbc119a 100644
--- a/spec/features/dashboard/user_filters_projects_spec.rb
+++ b/spec/features/dashboard/user_filters_projects_spec.rb
@@ -48,17 +48,39 @@ RSpec.describe 'Dashboard > User filters projects', :js, feature_category: :grou
     end
   end
 
-  it 'searches for projects' do
-    project2.add_developer(user)
-    visit dashboard_projects_path
+  context 'when feature flag your_work_projects_vue is enabled' do
+    it 'searches for projects' do
+      project2.add_developer(user)
+      visit member_dashboard_projects_path
+      wait_for_requests
 
-    expect(page).to have_content(project.name)
-    expect(page).to have_content(project2.name)
+      expect(page).to have_content(project.name)
+      expect(page).to have_content(project2.name)
 
-    search(project.name)
+      search(project.name)
 
-    expect(page).to have_content(project.name)
-    expect(page).not_to have_content(project2.name)
+      expect(page).to have_content(project.name)
+      expect(page).not_to have_content(project2.name)
+    end
+  end
+
+  context 'when feature flag your_work_projects_vue is disabled' do
+    before do
+      stub_feature_flags(your_work_projects_vue: false)
+    end
+
+    it 'searches for projects' do
+      project2.add_developer(user)
+      visit dashboard_projects_path
+
+      expect(page).to have_content(project.name)
+      expect(page).to have_content(project2.name)
+
+      search(project.name)
+
+      expect(page).to have_content(project.name)
+      expect(page).not_to have_content(project2.name)
+    end
   end
 
   def search(term)
diff --git a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index cfc493171ec..2bd9bcb6aca 100644
--- a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -49,34 +49,65 @@ RSpec.describe 'User visits the profile preferences page', :js, feature_category
   end
 
   describe 'User changes their default dashboard', :js do
-    before do
-      visit(profile_preferences_path)
+    context 'when feature flag your_work_projects_vue is enabled' do
+      before do
+        visit(profile_preferences_path)
+      end
+
+      it 'creates a flash message' do
+        select_from_listbox 'Starred Projects', from: 'Your Contributed Projects (default)', exact_item_text: true
+        click_button 'Save changes'
+
+        wait_for_requests
+
+        expect_preferences_saved_message
+      end
+
+      it 'updates their preference' do
+        select_from_listbox 'Starred Projects', from: 'Your Contributed Projects (default)', exact_item_text: true
+        click_button 'Save changes'
+
+        wait_for_requests
+
+        find('[data-track-label="gitlab_logo_link"]').click
+        wait_for_requests
+
+        expect(page).to have_content("You don't have any projects yet.")
+        expect(page).to have_current_path starred_dashboard_projects_path, ignore_query: true
+      end
     end
 
-    it 'creates a flash message' do
-      select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
-      click_button 'Save changes'
+    context 'when feature flag your_work_projects_vue is disabled' do
+      before do
+        stub_feature_flags(your_work_projects_vue: false)
+        visit(profile_preferences_path)
+      end
 
-      wait_for_requests
+      it 'creates a flash message' do
+        select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
+        click_button 'Save changes'
 
-      expect_preferences_saved_message
-    end
+        wait_for_requests
 
-    it 'updates their preference' do
-      select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
-      click_button 'Save changes'
+        expect_preferences_saved_message
+      end
 
-      wait_for_requests
+      it 'updates their preference' do
+        select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
+        click_button 'Save changes'
 
-      find('[data-track-label="gitlab_logo_link"]').click
+        wait_for_requests
 
-      expect(page).to have_content("You don't have starred projects yet")
-      expect(page).to have_current_path starred_dashboard_projects_path, ignore_query: true
+        find('[data-track-label="gitlab_logo_link"]').click
 
-      find('.shortcuts-activity').click
+        expect(page).to have_content("You don't have starred projects yet")
+        expect(page).to have_current_path starred_dashboard_projects_path, ignore_query: true
 
-      expect(page).not_to have_content("You don't have starred projects yet")
-      expect(page).to have_current_path dashboard_projects_path, ignore_query: true
+        find('.shortcuts-activity').click
+
+        expect(page).not_to have_content("You don't have starred projects yet")
+        expect(page).to have_current_path dashboard_projects_path, ignore_query: true
+      end
     end
   end
 
diff --git a/spec/features/projects/cluster_agents_spec.rb b/spec/features/projects/cluster_agents_spec.rb
index ab566b3b433..8751dab6d49 100644
--- a/spec/features/projects/cluster_agents_spec.rb
+++ b/spec/features/projects/cluster_agents_spec.rb
@@ -37,7 +37,8 @@ RSpec.describe 'ClusterAgents', :js, feature_category: :environment_management d
         visit project_clusters_path(project)
       end
 
-      it 'displays a table with agent', :aggregate_failures do
+      it 'displays a table with agent', :aggregate_failures,
+        quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/514076' do
         expect(page).to have_content(agent.name)
         expect(page).to have_selector('[data-testid="cluster-agent-list-table"] tbody tr', count: 1)
       end
diff --git a/spec/features/projects/show/user_interacts_with_stars_spec.rb b/spec/features/projects/show/user_interacts_with_stars_spec.rb
index 551fbce029a..0c6eaf03d66 100644
--- a/spec/features/projects/show/user_interacts_with_stars_spec.rb
+++ b/spec/features/projects/show/user_interacts_with_stars_spec.rb
@@ -32,26 +32,58 @@ RSpec.describe 'Projects > Show > User interacts with project stars', feature_ca
       expect(page).to have_css('.star-count', text: 0)
     end
 
-    it 'validates starring a project' do
-      project.add_owner(user)
+    context 'when feature flag your_work_projects_vue is enabled', :js do
+      it 'validates starring a project' do
+        project.add_owner(user)
 
-      star_project
+        star_project
 
-      visit(dashboard_projects_path)
+        visit(member_dashboard_projects_path)
+        wait_for_requests
 
-      expect(page).to have_css('.stars', text: 1)
+        expect(find_link('Stars')).to have_content('1')
+      end
+
+      it 'validates un-starring a project' do
+        project.add_owner(user)
+
+        star_project
+
+        unstar_project
+
+        visit(member_dashboard_projects_path)
+        wait_for_requests
+
+        expect(find_link('Stars')).to have_content('0')
+      end
     end
 
-    it 'validates un-starring a project' do
-      project.add_owner(user)
+    context 'when feature flag your_work_projects_vue is disabled' do
+      before do
+        stub_feature_flags(your_work_projects_vue: false)
+      end
 
-      star_project
+      it 'validates starring a project' do
+        project.add_owner(user)
 
-      unstar_project
+        star_project
 
-      visit(dashboard_projects_path)
+        visit(dashboard_projects_path)
 
-      expect(page).to have_css('.stars', text: 0)
+        expect(page).to have_css('.stars', text: 1)
+      end
+
+      it 'validates un-starring a project' do
+        project.add_owner(user)
+
+        star_project
+
+        unstar_project
+
+        visit(dashboard_projects_path)
+
+        expect(page).to have_css('.stars', text: 0)
+      end
     end
   end
 
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb
index 0c1bd9809e4..89a817b2b54 100644
--- a/spec/helpers/preferences_helper_spec.rb
+++ b/spec/helpers/preferences_helper_spec.rb
@@ -26,19 +26,42 @@ RSpec.describe PreferencesHelper, feature_category: :shared do
       expect { helper.dashboard_choices }.to raise_error(KeyError)
     end
 
-    it 'provides better option descriptions' do
-      expect(helper.dashboard_choices).to match_array [
-        { text: "Your Projects (default)", value: 'projects' },
-        { text: "Starred Projects", value: 'stars' },
-        { text: "Your Activity", value: 'your_activity' },
-        { text: "Your Projects' Activity", value: 'project_activity' },
-        { text: "Starred Projects' Activity", value: 'starred_project_activity' },
-        { text: "Followed Users' Activity", value: 'followed_user_activity' },
-        { text: "Your Groups", value: 'groups' },
-        { text: "Your To-Do List", value: 'todos' },
-        { text: "Assigned issues", value: 'issues' },
-        { text: "Assigned merge requests", value: 'merge_requests' }
-      ]
+    context 'when feature flag your_work_projects_vue is enabled' do
+      it 'returns expected options' do
+        expect(helper.dashboard_choices).to match_array [
+          { text: "Your Contributed Projects (default)", value: 'projects' },
+          { text: "Starred Projects", value: 'stars' },
+          { text: "Your Activity", value: 'your_activity' },
+          { text: "Your Projects' Activity", value: 'project_activity' },
+          { text: "Starred Projects' Activity", value: 'starred_project_activity' },
+          { text: "Followed Users' Activity", value: 'followed_user_activity' },
+          { text: "Your Groups", value: 'groups' },
+          { text: "Your To-Do List", value: 'todos' },
+          { text: "Assigned issues", value: 'issues' },
+          { text: "Assigned merge requests", value: 'merge_requests' }
+        ]
+      end
+    end
+
+    context 'when feature flag your_work_projects_vue is disabled' do
+      before do
+        stub_feature_flags(your_work_projects_vue: false)
+      end
+
+      it 'returns expected options' do
+        expect(helper.dashboard_choices).to match_array [
+          { text: "Your Projects (default)", value: 'projects' },
+          { text: "Starred Projects", value: 'stars' },
+          { text: "Your Activity", value: 'your_activity' },
+          { text: "Your Projects' Activity", value: 'project_activity' },
+          { text: "Starred Projects' Activity", value: 'starred_project_activity' },
+          { text: "Followed Users' Activity", value: 'followed_user_activity' },
+          { text: "Your Groups", value: 'groups' },
+          { text: "Your To-Do List", value: 'todos' },
+          { text: "Assigned issues", value: 'issues' },
+          { text: "Assigned merge requests", value: 'merge_requests' }
+        ]
+      end
     end
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f37350e7e57..10cb5141837 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -339,10 +339,6 @@ RSpec.configure do |config|
       # Experimental merge request dashboard
       stub_feature_flags(merge_request_dashboard: false)
 
-      # Since we are very early in the Vue migration, there isn't much value in testing when the feature flag is enabled
-      # Please see https://gitlab.com/gitlab-org/gitlab/-/issues/466081 for tracking revisiting this.
-      stub_feature_flags(your_work_projects_vue: false)
-
       # This feature flag allows enabling self-hosted features on Staging Ref: https://gitlab.com/gitlab-org/gitlab/-/issues/497784
       stub_feature_flags(allow_self_hosted_features_for_com: false)