diff --git a/app/metrics.yaml b/app/metrics.yaml
index 904a3635b7fd..cd3f6ebf39b8 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -557,9 +557,14 @@ search_shortcuts:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
+        - Shortcuts
 
 experiments_default_browser:
   toolbar_menu_clicked:
@@ -593,11 +598,16 @@ toolbar_settings:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Toolbar
 
 context_menu:
   item_tapped:
@@ -642,11 +652,15 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/pull/13050
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   cancelled:
     type: event
     description: |
@@ -657,11 +671,15 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/pull/13050
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   saved:
     type: event
     description: |
@@ -672,11 +690,15 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/pull/13050
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   never_save:
     type: event
     description: |
@@ -687,11 +709,15 @@ login_dialog:
       - https://github.com/mozilla-mobile/fenix/pull/13050
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
 
 metrics:
   default_browser:
@@ -818,11 +844,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/16942#issuecomment-742794701
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Bookmarks
   top_sites_count:
     type: counter
     lifetime: application
@@ -891,11 +921,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - PWA
   has_recent_pwas:
     type: boolean
     lifetime: application
@@ -911,11 +945,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - PWA
   search_count:
     type: labeled_counter
     description: |
@@ -967,12 +1005,16 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   default_moz_browser:
     type: string
     lifetime: application
@@ -989,12 +1031,16 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   adjust_campaign:
     type: string
     lifetime: application
@@ -1012,11 +1058,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Telemetry
   adjust_ad_group:
     type: string
     lifetime: application
@@ -1034,11 +1084,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Telemetry
   adjust_creative:
     type: string
     lifetime: application
@@ -1056,11 +1110,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Telemetry
   adjust_network:
     type: string
     lifetime: application
@@ -1078,11 +1136,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Telemetry
   toolbar_position:
     type: string
     lifetime: application
@@ -1097,11 +1159,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Toolbar
   close_tab_setting:
     type: string
     lifetime: application
@@ -1116,11 +1182,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Tabs
   tab_view_setting:
     type: string
     lifetime: application
@@ -1135,11 +1205,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15811#issuecomment-706402952
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Tabs
   search_widget_installed:
     type: boolean
     lifetime: application
@@ -1154,11 +1228,16 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Discovery
+        - Search
   tabs_open_count:
     type: counter
     lifetime: application
@@ -1198,11 +1277,15 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Tabs
   start_reason_process_error:
     type: boolean
     description: |
@@ -1248,11 +1331,13 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/issues/22138
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/22224#issuecomment-956749994
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
   inactive_tabs_count:
     type: quantity
     description: |
@@ -1265,11 +1350,12 @@ metrics:
       - https://github.com/mozilla-mobile/fenix/issues/22155
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/22163#issuecomment-957636802
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
     unit: integer
 
 customize_home:
@@ -1442,11 +1528,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Search
+        - Settings
   remote_debugging_enabled:
     type: boolean
     description: |
@@ -1461,11 +1553,15 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   telemetry_enabled:
     type: boolean
     description: |
@@ -1482,11 +1578,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Telemetry
+        - Settings
   enhanced_tracking_protection:
     type: string
     description: |
@@ -1502,11 +1604,16 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
+        - Settings
   bookmarks_suggestion:
     type: boolean
     description: |
@@ -1521,11 +1628,15 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   browsing_history_suggestion:
     type: boolean
     description: |
@@ -1540,11 +1651,15 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   clipboard_suggestions_enabled:
     type: boolean
     description: |
@@ -1559,11 +1674,15 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   search_shortcuts_enabled:
     type: boolean
     description: |
@@ -1578,11 +1697,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Search
+        - Settings
   signed_in_sync:
     type: boolean
     description: |
@@ -1597,11 +1722,16 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Sync
+        - Settings
   sync_items:
     type: string_list
     description: |
@@ -1618,11 +1748,15 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Settings
   voice_search_enabled:
     type: boolean
     description: |
@@ -1637,11 +1771,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
+        - Voice
+        - Settings
   toolbar_position_setting:
     type: string
     description: |
@@ -1656,11 +1796,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Toolbar
+        - Settings
   accessibility_services:
     type: string_list
     description: |
@@ -1676,11 +1822,16 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Settings
   open_links_in_app_enabled:
     type: boolean
     description: |
@@ -1695,11 +1846,16 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Settings
   user_theme:
     type: string
     description: |
@@ -1714,11 +1870,17 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+      - erichards@mozilla.com
+    expires: never
+    metadata:
+      tags:
+        - Themes
+        - Settings
   inactive_tabs_enabled:
     type: boolean
     description: |
@@ -1744,11 +1906,12 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/issues/21732
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/21862#issuecomment-949598042
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
   turn_off_inactive_tabs_survey:
     type: event
     description: >
@@ -1762,11 +1925,12 @@ preferences:
       - https://github.com/mozilla-mobile/fenix/issues/21732
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/21862#issuecomment-946977614
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
   search_term_groups_enabled:
     type: boolean
     description: |
@@ -1854,12 +2018,13 @@ search.default_engine:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
 
 bookmarks_management:
   open:
@@ -2245,11 +2410,16 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Toolbar
+        - Sync
   closed:
     type: event
     description: |
@@ -2261,11 +2431,16 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Toolbar
+        - Sync
   use_email:
     type: event
     description: |
@@ -2278,11 +2453,15 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Sync
   use_email_problem:
     type: event
     description: |
@@ -2294,11 +2473,15 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Sync
   sign_in:
     type: event
     description: |
@@ -2368,12 +2551,16 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Accounts
   recovered:
     type: event
     description: |
@@ -2386,12 +2573,16 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Accounts
   other_external:
     type: event
     description: |
@@ -2404,12 +2595,16 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - technical
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Accounts
   scan_pairing:
     type: event
     description: |
@@ -2421,11 +2616,15 @@ sync_auth:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Sync
 
 sync_account:
   opened:
@@ -2439,11 +2638,16 @@ sync_account:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Toolbar
+        - Sync
   sync_now:
     type: event
     description: |
@@ -2455,11 +2659,16 @@ sync_account:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Toolbar
+        - Sync
   send_tab:
     type: event
     description: |
@@ -2471,11 +2680,15 @@ sync_account:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - SendTab
   sign_in_to_send_tab:
     type: event
     description: |
@@ -2487,11 +2700,15 @@ sync_account:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - SendTab
 
 history:
   opened:
@@ -2505,11 +2722,15 @@ history:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - History
   removed:
     type: event
     description: |
@@ -2521,11 +2742,15 @@ history:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - History
   removed_all:
     type: event
     description: |
@@ -2537,11 +2762,15 @@ history:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - History
   shared:
     type: event
     description: |
@@ -2553,11 +2782,15 @@ history:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - History
   opened_item:
     type: event
     description: |
@@ -3482,11 +3715,15 @@ search_widget:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
   voice_button:
     type: event
     description: |
@@ -3498,11 +3735,15 @@ search_widget:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
 
 tracking_protection:
   exception_added:
@@ -3517,11 +3758,15 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
   panel_settings:
     type: event
     description: |
@@ -3533,11 +3778,15 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
   etp_shield:
     type: event
     description: |
@@ -3549,11 +3798,15 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
   etp_tracker_list:
     type: event
     description: |
@@ -3566,11 +3819,15 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
   etp_settings:
     type: event
     description: |
@@ -3582,11 +3839,15 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - TrackingProtection
   etp_setting_changed:
     type: event
     description: |
@@ -3604,11 +3865,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
 
 tab:
   media_play:
@@ -3622,11 +3884,12 @@ tab:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
     no_lint:
       - COMMON_PREFIX
   media_pause:
@@ -3640,11 +3903,15 @@ tab:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
 
 media_notification:
   play:
@@ -3658,11 +3925,15 @@ media_notification:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
   pause:
     type: event
     description: |
@@ -3674,11 +3945,15 @@ media_notification:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
 
 media_state:
   play:
@@ -3692,11 +3967,15 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
   pause:
     type: event
     description: |
@@ -3708,11 +3987,15 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
   stop:
     type: event
     description: |
@@ -3724,11 +4007,15 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
   fullscreen:
     type: event
     description: |
@@ -3739,11 +4026,15 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/pull/16833
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
   picture_in_picture:
     type: event
     description: |
@@ -3754,11 +4045,15 @@ media_state:
       - https://github.com/mozilla-mobile/fenix/pull/16833
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Media
 
 logins:
   open_logins:
@@ -3790,11 +4085,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   copy_login:
     type: event
     description: |
@@ -3806,11 +4105,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   view_password_login:
     type: event
     description: |
@@ -3822,11 +4125,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   save_logins_setting_changed:
     type: event
     description: |
@@ -3843,11 +4150,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   open_login_editor:
     type: event
     description: |
@@ -3859,11 +4170,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   delete_saved_login:
     type: event
     description: |
@@ -3875,11 +4190,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
   save_edited_login:
     type: event
     description: |
@@ -3891,11 +4210,15 @@ logins:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Logins
 
 voice_search:
   tapped:
@@ -3909,12 +4232,16 @@ voice_search:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
-
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
+        - Voice
 top_sites:
   open_default:
     type: event
@@ -3959,11 +4286,16 @@ top_sites:
       - https://github.com/mozilla-mobile/fenix/issues/19490
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/20705
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - Search
+        - TopSites
   open_frecency:
     type: event
     description: |
@@ -4106,11 +4438,12 @@ top_sites:
       - https://github.com/mozilla-mobile/fenix/issues/21841
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/21845#issuecomment-944608568
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
   baidu_top_site_removed:
     type: event
     description: |
@@ -4119,11 +4452,12 @@ top_sites:
       - https://github.com/mozilla-mobile/fenix/issues/21841
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/21845#issuecomment-944608568
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
 
 app_theme:
   dark_theme_selected:
@@ -4182,11 +4516,16 @@ pocket:
       - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - PocketIntegration
+        - TopSites
   home_recs_shown:
     type: event
     description: |
@@ -4946,11 +5285,15 @@ autoplay:
       - https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - SitePermissions
   setting_changed:
     type: event
     description: |
@@ -4967,12 +5310,15 @@ autoplay:
       - https://github.com/mozilla-mobile/fenix/pull/13041#issuecomment-665777411
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
-
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - SitePermissions
 storage.stats:
   query_stats_duration:
     send_in_pings:
@@ -5354,11 +5700,15 @@ synced_tabs:
       - https://github.com/mozilla-mobile/fenix/pull/18172
       - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
       - https://github.com/mozilla-mobile/fenix/pull/20517#pullrequestreview-718069041
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
+    metadata:
+      tags:
+        - SyncTabs
 
 awesomebar:
   bookmark_suggestion_clicked:
@@ -5951,11 +6301,12 @@ recent_bookmarks:
       - https://github.com/mozilla-mobile/fenix/issues/19931
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/20316#issuecomment-888291843
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
   show_all_bookmarks:
     type: counter
     lifetime: application
@@ -5969,11 +6320,12 @@ recent_bookmarks:
       - https://github.com/mozilla-mobile/fenix/issues/19931
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/20316#issuecomment-888291843
+      - https://github.com/mozilla-mobile/fenix/pull/23453#issuecomment-1024694220
     data_sensitivity:
       - interaction
     notification_emails:
       - android-probes@mozilla.com
-    expires: "2022-02-01"
+    expires: "2023-02-01"
   recent_bookmarks_count:
     type: quantity
     description: |
diff --git a/app/tags.yaml b/app/tags.yaml
new file mode 100644
index 000000000000..120aa56f9a52
--- /dev/null
+++ b/app/tags.yaml
@@ -0,0 +1,214 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+### This file was AUTOMATICALLY GENERATED by `./tools/update-glean-tags.py`
+### DO NOT edit it by hand.
+
+# Disable line-length rule because the links in the descriptions can be long
+# yamllint disable rule:line-length
+
+
+---
+$schema: moz://mozilla.org/schemas/glean/tags/1-0-0
+Accounts:
+  description: Corresponds to the [Feature:Accounts](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AAccounts)
+    label on GitHub.
+AndroidIntegration:
+  description: Corresponds to the [Feature:AndroidIntegration](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AAndroidIntegration)
+    label on GitHub.
+Autofill:
+  description: Address and Credit Card autofill. Corresponds to the [Feature:Autofill](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AAutofill)
+    label on GitHub.
+Battery:
+  description: Corresponds to the [Feature:Battery](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ABattery)
+    label on GitHub.
+Bookmarks:
+  description: Corresponds to the [Feature:Bookmarks](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ABookmarks)
+    label on GitHub.
+Browsing:
+  description: Issues related to browsing experience, browser navigation, not web
+    issues. Corresponds to the [Feature:Browsing](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ABrowsing)
+    label on GitHub.
+China:
+  description: Corresponds to the [Feature:China](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AChina)
+    label on GitHub.
+Collections:
+  description: Corresponds to the [Feature:Collections](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ACollections)
+    label on GitHub.
+ContextMenu:
+  description: Menu that appears when long-pressing on website content. Corresponds
+    to the [Feature:ContextMenu](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AContextMenu)
+    label on GitHub.
+CrashReporting:
+  description: Corresponds to the [Feature:CrashReporting](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ACrashReporting)
+    label on GitHub.
+CustomTabs:
+  description: Corresponds to the [Feature:CustomTabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ACustomTabs)
+    label on GitHub.
+Discovery:
+  description: Corresponds to the [Feature:Discovery](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ADiscovery)
+    label on GitHub.
+Download:
+  description: Corresponds to the [Feature:Download](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ADownload)
+    label on GitHub.
+ErrorMessages:
+  description: Corresponds to the [Feature:ErrorMessages](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AErrorMessages)
+    label on GitHub.
+Experiments:
+  description: A category for experiment-related features.. Corresponds to the [Feature:Experiments](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AExperiments)
+    label on GitHub.
+FennecTransition:
+  description: Corresponds to the [Feature:FennecTransition](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AFennecTransition)
+    label on GitHub.
+FindBar:
+  description: Corresponds to the [Feature:FindBar](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AFindBar)
+    label on GitHub.
+Forms:
+  description: Corresponds to the [Feature:Forms](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AForms)
+    label on GitHub.
+Gesture:
+  description: Corresponds to the [Feature:Gesture](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AGesture)
+    label on GitHub.
+History:
+  description: Corresponds to the [Feature:History](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AHistory)
+    label on GitHub.
+HomeScreen:
+  description: Corresponds to the [Feature:HomeScreen](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AHomeScreen)
+    label on GitHub.
+IME:
+  description: Text entry and keyboards. Corresponds to the [Feature:IME](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AIME)
+    label on GitHub.
+InactiveTabs:
+  description: Tabs in the tabs tray that have not been used in some time.. Corresponds
+    to the [Feature:InactiveTabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AInactiveTabs)
+    label on GitHub.
+Logins:
+  description: Corresponds to the [Feature:Logins](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ALogins)
+    label on GitHub.
+MainMenu:
+  description: The three-dot menu that is seen on the browser and homescreen.. Corresponds
+    to the [Feature:MainMenu](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AMainMenu)
+    label on GitHub.
+Media:
+  description: Corresponds to the [Feature:Media](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AMedia)
+    label on GitHub.
+Migration:
+  description: Corresponds to the [Feature:Migration](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AMigration)
+    label on GitHub.
+Notifications:
+  description: Corresponds to the [Feature:Notifications](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ANotifications)
+    label on GitHub.
+Offline:
+  description: Corresponds to the [Feature:Offline](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AOffline)
+    label on GitHub.
+Onboarding:
+  description: First Run, Contextual Feature Recommendation/Recommender CFR. Corresponds
+    to the [Feature:Onboarding](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AOnboarding)
+    label on GitHub.
+OpenInApp:
+  description: intents. Corresponds to the [Feature:OpenInApp](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AOpenInApp)
+    label on GitHub.
+PWA:
+  description: Progressive Web App. Corresponds to the [Feature:PWA](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APWA)
+    label on GitHub.
+Performance:
+  description: Used for data reviews to label metrics related to performance. Corresponds
+    to the [Feature:Performance](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APerformance)
+    label on GitHub.
+PocketIntegration:
+  description: Corresponds to the [Feature:PocketIntegration](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APocketIntegration)
+    label on GitHub.
+Privacy&Security:
+  description: Corresponds to the [Feature:Privacy&Security](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APrivacy%26Security)
+    label on GitHub.
+PrivateBrowsing:
+  description: Corresponds to the [Feature:PrivateBrowsing](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APrivateBrowsing)
+    label on GitHub.
+Push:
+  description: WebPush or Marketing push related features.. Corresponds to the [Feature:Push](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3APush)
+    label on GitHub.
+QRCode:
+  description: Corresponds to the [Feature:QRCode](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AQRCode)
+    label on GitHub.
+QuickSettings:
+  description: Corresponds to the [Feature:QuickSettings](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AQuickSettings)
+    label on GitHub.
+ReaderMode:
+  description: Corresponds to the [Feature:ReaderMode](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AReaderMode)
+    label on GitHub.
+RecentTabs:
+  description: Recent tabs on the homescreen. Corresponds to the [Feature:RecentTabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ARecentTabs)
+    label on GitHub.
+RequestDesktopSite:
+  description: Corresponds to the [Feature:RequestDesktopSite](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ARequestDesktopSite)
+    label on GitHub.
+Search:
+  description: Corresponds to the [Feature:Search](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASearch)
+    label on GitHub.
+SearchGroupHistory:
+  description: Search term groups on History view. Corresponds to the [Feature:SearchGroupHistory](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASearchGroupHistory)
+    label on GitHub.
+SearchProvider:
+  description: Corresponds to the [Feature:SearchProvider](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASearchProvider)
+    label on GitHub.
+SearchTermTabs:
+  description: Tabs in the tabs tray that have the same search term.. Corresponds
+    to the [Feature:SearchTermTabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASearchTermTabs)
+    label on GitHub.
+SendTab:
+  description: Corresponds to the [Feature:SendTab](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASendTab)
+    label on GitHub.
+Settings:
+  description: Corresponds to the [Feature:Settings](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASettings)
+    label on GitHub.
+Sharing:
+  description: Corresponds to the [Feature:Sharing](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASharing)
+    label on GitHub.
+Shortcuts:
+  description: bookmarks on the Android homescreen. Corresponds to the [Feature:Shortcuts](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AShortcuts)
+    label on GitHub.
+SitePermissions:
+  description: Corresponds to the [Feature:SitePermissions](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASitePermissions)
+    label on GitHub.
+Snackbar:
+  description: Corresponds to the [Feature:Snackbar](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASnackbar)
+    label on GitHub.
+Sync:
+  description: Corresponds to the [Feature:Sync](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASync)
+    label on GitHub.
+SyncTabs:
+  description: Sync tabs. Corresponds to the [Feature:SyncTabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASyncTabs)
+    label on GitHub.
+Tabs:
+  description: Corresponds to the [Feature:Tabs](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATabs)
+    label on GitHub.
+Telemetry:
+  description: Corresponds to the [Feature:Telemetry](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATelemetry)
+    label on GitHub.
+TextSelection:
+  description: Corresponds to the [Feature:TextSelection](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATextSelection)
+    label on GitHub.
+Themes:
+  description: Dark mode, light mode, private browsing mode. Corresponds to the
+    [Feature:Themes](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AThemes)
+    label on GitHub.
+Toolbar:
+  description: Address bar, see also Feature:Search. Corresponds to the [Feature:Toolbar](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AToolbar)
+    label on GitHub.
+TopSites:
+  description: Corresponds to the [Feature:TopSites](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATopSites)
+    label on GitHub.
+TrackingProtection:
+  description: Corresponds to the [Feature:TrackingProtection](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATrackingProtection)
+    label on GitHub.
+Voice:
+  description: Corresponds to the [Feature:Voice](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AVoice)
+    label on GitHub.
+WebAuthn:
+  description: Feature work pertaining to WebAuthn. Corresponds to the [Feature:WebAuthn](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AWebAuthn)
+    label on GitHub.
+WebExtensions:
+  description: Corresponds to the [Feature:WebExtensions](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AWebExtensions)
+    label on GitHub.
diff --git a/tools/update-glean-tags.py b/tools/update-glean-tags.py
new file mode 100755
index 000000000000..183ac60eba85
--- /dev/null
+++ b/tools/update-glean-tags.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+
+"""
+Scrapes GitHub labels for Fenix and generates a set of glean tags for use in metrics
+
+See https://mozilla.github.io/glean/book/reference/yaml/tags.html
+"""
+import urllib
+from pathlib import Path
+
+import requests
+import yaml
+
+
+LICENSE_HEADER = """# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+
+GENERATED_HEADER = """
+### This file was AUTOMATICALLY GENERATED by `./tools/update-glean-tags.py`
+### DO NOT edit it by hand.
+
+# Disable line-length rule because the links in the descriptions can be long
+# yamllint disable rule:line-length
+"""
+
+TAGS_FILENAME = (Path(__file__).parent / "../app/tags.yaml").resolve()
+
+labels = []
+page = 1
+while True:
+    more_labels = requests.get(
+        f"https://api.github.com/repos/mozilla-mobile/fenix/labels?per_page=100&page={page}"
+    ).json()
+    if not more_labels:
+        break
+    labels += more_labels
+    page += 1
+
+tags = {"$schema": "moz://mozilla.org/schemas/glean/tags/1-0-0"}
+for label in labels:
+    if label["name"].startswith("Feature:"):
+        abbreviated_label = label["name"].replace("Feature:", "")
+        url = (
+            "https://github.com/mozilla-mobile/fenix/issues?q="
+            + urllib.parse.quote_plus(f"label:{label['name']}")
+        )
+        label_description = (
+            (label["description"].strip() + ". ") if len(label["description"]) else ""
+        )
+        tags[abbreviated_label] = {
+            "description": f"{label_description}Corresponds to the [{label['name']}]({url}) label on GitHub."
+        }
+
+open(TAGS_FILENAME, "w").write(
+    "{}\n{}\n\n".format(LICENSE_HEADER, GENERATED_HEADER)
+    + yaml.dump(tags, width=78, explicit_start=True)
+)