diff --git a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_1pct_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_1pct_v1/metadata.yaml
index 609263975d4..6eeecda2725 100644
--- a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_1pct_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_1pct_v1/metadata.yaml
@@ -7,6 +7,7 @@ owners:
 - dpalmeiro@mozilla.com
 labels:
   incremental: true
+  table_type: client_level
 scheduling:
   dag_name: bqetl_pageload_v1
   task_name: firefox_desktop_pageload_1pct__v1
@@ -16,7 +17,7 @@ bigquery:
     type: day
     field: submission_timestamp
     require_partition_filter: true
-    expiration_days: 780
+    expiration_days: 775
   range_partitioning: null
   clustering:
     fields:
diff --git a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_nightly_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_nightly_v1/metadata.yaml
index 41066f0c65f..1892031ea10 100644
--- a/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_nightly_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/firefox_desktop_derived/pageload_nightly_v1/metadata.yaml
@@ -7,6 +7,7 @@ owners:
 - dpalmeiro@mozilla.com
 labels:
   incremental: true
+  table_type: client_level
 scheduling:
   dag_name: bqetl_pageload_v1
   task_name: firefox_desktop_pageload_nightly__v1
@@ -16,6 +17,6 @@ bigquery:
     type: day
     field: submission_timestamp
     require_partition_filter: true
-    expiration_days: 780
+    expiration_days: 775
   range_partitioning: null
 references: {}
diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/clients_daily_event_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_daily_event_v1/metadata.yaml
index 362c82264b8..90c67d6bb06 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/clients_daily_event_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_daily_event_v1/metadata.yaml
@@ -8,8 +8,9 @@ description: |-
 labels:
   application: firefox
   schedule: daily
+  table_type: client_level
 owners:
-  - jklukas@mozilla.com
+  - ascholtz@mozilla.com
 scheduling:
   dag_name: bqetl_main_summary
   start_date: "2021-01-19"
@@ -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/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_event_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_event_v1/metadata.yaml
index 2e5829851ac..3593e5ca1ab 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_event_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_event_v1/metadata.yaml
@@ -6,12 +6,12 @@ description: |-
   We join main ping and event data together in clients_last_seen_joined_v1,
   which then becomes the source for the user-facing view.
 owners:
-- jklukas@mozilla.com
+- ascholtz@mozilla.com
 labels:
   application: firefox
   schedule: daily
   dag: bqetl_main_summary
-  owner1: jklukas
+  owner1: ascholtz
 scheduling:
   dag_name: bqetl_main_summary
   start_date: '2021-01-19'
@@ -22,7 +22,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
-    expiration_days: null
+    expiration_days: 775
   clustering:
     fields:
     - sample_id
diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_joined_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_joined_v1/metadata.yaml
index e0549e71965..653e387ebec 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_joined_v1/metadata.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_joined_v1/metadata.yaml
@@ -16,7 +16,8 @@ labels:
   application: firefox
   schedule: daily
   dag: bqetl_main_summary
-  owner1: ascholtzs
+  owner1: ascholtz
+  table_type: client_level
 scheduling:
   dag_name: bqetl_main_summary
   start_date: '2021-01-19'
@@ -27,7 +28,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: false
-    expiration_days: null
+    expiration_days: 775
   range_partitioning: null
   clustering:
     fields:
diff --git a/sql_generators/glean_usage/templates/clients_last_seen_joined.metadata.yaml b/sql_generators/glean_usage/templates/clients_last_seen_joined.metadata.yaml
index 26dd50a028b..778b6b4399b 100644
--- a/sql_generators/glean_usage/templates/clients_last_seen_joined.metadata.yaml
+++ b/sql_generators/glean_usage/templates/clients_last_seen_joined.metadata.yaml
@@ -16,6 +16,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_glean_usage
   task_group: {{ app_name }}
@@ -25,6 +26,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - normalized_channel
diff --git a/sql_generators/glean_usage/templates/events_stream_v1.metadata.yaml b/sql_generators/glean_usage/templates/events_stream_v1.metadata.yaml
index 18aa2d4e2b6..9b0dfa68ae3 100644
--- a/sql_generators/glean_usage/templates/events_stream_v1.metadata.yaml
+++ b/sql_generators/glean_usage/templates/events_stream_v1.metadata.yaml
@@ -11,6 +11,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_glean_usage
   task_group: {{ app_name }}
@@ -26,6 +27,7 @@ bigquery:
     type: day
     field: submission_timestamp
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
     - sample_id
diff --git a/sql_generators/glean_usage/templates/metrics_clients_daily.metadata.yaml b/sql_generators/glean_usage/templates/metrics_clients_daily.metadata.yaml
index e3ef42a109e..88d7a21e489 100644
--- a/sql_generators/glean_usage/templates/metrics_clients_daily.metadata.yaml
+++ b/sql_generators/glean_usage/templates/metrics_clients_daily.metadata.yaml
@@ -7,6 +7,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_glean_usage
   task_group: {{ app_name }}
@@ -15,6 +16,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - normalized_channel
diff --git a/sql_generators/glean_usage/templates/metrics_clients_last_seen.metadata.yaml b/sql_generators/glean_usage/templates/metrics_clients_last_seen.metadata.yaml
index 737f3d4b153..4b271b0254a 100644
--- a/sql_generators/glean_usage/templates/metrics_clients_last_seen.metadata.yaml
+++ b/sql_generators/glean_usage/templates/metrics_clients_last_seen.metadata.yaml
@@ -12,6 +12,7 @@ owners:
 labels:
   incremental: true
   schedule: daily
+  table_type: client_level
 scheduling:
   dag_name: bqetl_glean_usage
   task_group: {{ app_name }}
@@ -20,6 +21,7 @@ bigquery:
     type: day
     field: submission_date
     require_partition_filter: true
+    expiration_days: 775
   clustering:
     fields:
       - normalized_channel