diff --git a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_clients_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_clients_v1/metadata.yaml
index e59158c0b4e..4c96a8e982a 100644
--- a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_clients_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_clients_v1/metadata.yaml
@@ -6,6 +6,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_review_checker
   task_name: firefox_desktop_review_checker_clients__v1
@@ -14,6 +15,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
     - normalized_channel
diff --git a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_events_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_events_v1/metadata.yaml
index 4fc82104370..4ca332687ce 100644
--- a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_events_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_events_v1/metadata.yaml
@@ -8,6 +8,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_review_checker
   task_name: firefox_desktop_review_checker_events__v1
@@ -16,6 +17,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
     - normalized_channel
diff --git a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_microsurvey_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_microsurvey_v1/metadata.yaml
index 0005cc4d762..360ed8fc35c 100644
--- a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_microsurvey_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/review_checker_microsurvey_v1/metadata.yaml
@@ -6,6 +6,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_review_checker
   task_name: firefox_desktop_review_checker_microsurvey__v1
@@ -14,6 +15,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
     - normalized_channel
diff --git a/sql/moz-fx-data-shared-prod/search_derived/desktop_mobile_search_clients_monthly_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/search_derived/desktop_mobile_search_clients_monthly_v1/metadata.yaml
index 476ee986776..e52aa306ae4 100644
--- a/sql/moz-fx-data-shared-prod/search_derived/desktop_mobile_search_clients_monthly_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/search_derived/desktop_mobile_search_clients_monthly_v1/metadata.yaml
@@ -7,6 +7,7 @@ owners:
 labels:
   incremental: true
   schedule: monthly
+  table_type: client_level
 scheduling:
   dag_name: bqetl_desktop_mobile_search_monthly
   date_partition_parameter: null
@@ -23,4 +24,5 @@ bigquery:
     type: month
     field: submission_month
     require_partition_filter: true
+    expiration_days: 775
   clustering: null
diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_historical_pre202408/metadata.yaml b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_historical_pre202408/metadata.yaml
index 435d79e0342..5a6013d24cc 100644
--- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_historical_pre202408/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_historical_pre202408/metadata.yaml
@@ -7,6 +7,8 @@ description: |-
   pulls from metrics, and after 2024.07.31, pulls from baseline.
 
   This table contains the historical data.
+labels:
+  table_type: client_level
 owners:
   - akommasani@mozilla.com
   - mbowerman@mozilla.com
@@ -15,4 +17,4 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
-    expiration_days: null
+    expiration_days: 775
diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/metadata.yaml
index e62450df002..3d70d3364ae 100755
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/metadata.yaml
@@ -7,6 +7,7 @@ labels:
   application: firefox
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_urlbar
 bigquery:
@@ -14,6 +15,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
     - normalized_channel
diff --git a/sql_generators/search_v2/templates/mobile_search_clients_engines_sources_daily.metadata.yaml b/sql_generators/search_v2/templates/mobile_search_clients_engines_sources_daily.metadata.yaml
index f19cea9c528..4f2b7fd01fb 100644
--- a/sql_generators/search_v2/templates/mobile_search_clients_engines_sources_daily.metadata.yaml
+++ b/sql_generators/search_v2/templates/mobile_search_clients_engines_sources_daily.metadata.yaml
@@ -12,6 +12,7 @@ owners:
   - akommasani@mozilla.com
 labels:
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_mobile_search
 bigquery:
@@ -19,6 +20,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - sample_id
diff --git a/sql_generators/serp_events_v2/templates/metadata.yaml b/sql_generators/serp_events_v2/templates/metadata.yaml
index f53b3211fbf..63ebd14aa3a 100644
--- a/sql_generators/serp_events_v2/templates/metadata.yaml
+++ b/sql_generators/serp_events_v2/templates/metadata.yaml
@@ -10,6 +10,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_serp
   task_name: {{ app_name }}_serp_events__v2
@@ -31,6 +32,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - normalized_channel
diff --git a/sql_generators/urlbar_events/templates/metadata.yaml b/sql_generators/urlbar_events/templates/metadata.yaml
index 5c24db6fd66..159ee62b510 100644
--- a/sql_generators/urlbar_events/templates/metadata.yaml
+++ b/sql_generators/urlbar_events/templates/metadata.yaml
@@ -11,6 +11,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_urlbar
   task_name: {{ app_name }}_urlbar_events__v2
@@ -19,6 +20,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - normalized_channel