diff --git a/focus-ios/Blockzilla/metrics.yaml b/focus-ios/Blockzilla/metrics.yaml
index cea6bd1970..a32e0c031c 100644
--- a/focus-ios/Blockzilla/metrics.yaml
+++ b/focus-ios/Blockzilla/metrics.yaml
@@ -46,9 +46,10 @@ app:
       - https://github.com/mozilla-mobile/focus-ios/issues/3526
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/3572
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2023-11-10"
+    expires: "2024-07-10"
 
 browser:
   total_uri_count:
@@ -83,11 +84,12 @@ browser:
       - https://github.com/mozilla-mobile/focus-ios/issues/3525
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/3569
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
     data_sensitivity:
       - interaction
-    expires: "2023-11-10"
+    expires: "2024-07-10"
 
 mozilla_products:
   has_firefox_installed:
@@ -133,11 +135,12 @@ settings_screen:
       - https://github.com/mozilla-mobile/focus-ios/issues/2094
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2283
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
 tracking_protection:
   toolbar_shield_clicked:
@@ -149,11 +152,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
   tracking_protection_changed:
     type: event
@@ -163,11 +167,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
     extra_keys:
       is_enabled:
         description: The new setting for ETP, true for ON, false for OFF
@@ -198,11 +203,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
     extra_keys:
       source_of_change:
         description: The source of interaction, "Panel" or "Settings"
@@ -224,11 +230,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
   has_advertising_blocked:
     type: boolean
@@ -239,11 +246,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
   has_analytics_blocked:
     type: boolean
@@ -254,11 +262,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
   has_content_blocked:
     type: boolean
@@ -269,11 +278,12 @@ tracking_protection:
       - https://github.com/mozilla-mobile/focus-ios/issues/2093
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2265
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-17"
+    expires: "2024-07-17"
 
 shortcuts:
   shortcuts_on_home_number:
@@ -285,11 +295,12 @@ shortcuts:
       - https://github.com/mozilla-mobile/focus-ios/issues/2092
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2232
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-20"
+    expires: "2024-07-20"
     unit: shortcut(s)
   shortcut_opened_counter:
     type: counter
@@ -300,11 +311,12 @@ shortcuts:
       - https://github.com/mozilla-mobile/focus-ios/issues/2092
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2232
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-20"
+    expires: "2024-07-20"
   shortcut_added_counter:
     type: counter
     description: |
@@ -314,11 +326,12 @@ shortcuts:
       - https://github.com/mozilla-mobile/focus-ios/issues/2092
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2232
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-20"
+    expires: "2024-07-20"
   shortcut_removed_counter:
     type: labeled_counter
     description: |
@@ -329,11 +342,12 @@ shortcuts:
       - https://github.com/mozilla-mobile/focus-ios/issues/2092
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2232
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-08-20"
+    expires: "2024-07-20"
     labels:
       - removed_from_browser_menu
       - removed_from_home_screen
@@ -349,11 +363,12 @@ preferences:
       - https://github.com/mozilla-mobile/focus-ios/issues/2496
     data_reviews:
       - https://github.com/mozilla-mobile/focus-ios/pull/2621
+      - https://github.com/mozilla-mobile/focus-ios/pull/4023
     data_sensitivity:
       - interaction
     notification_emails:
       - focus-ios-data-stewards@mozilla.com
-    expires: "2022-10-01"
+    expires: "2024-07-01"
 
 browser_menu:
   browser_menu_action:
@@ -777,4 +792,4 @@ webview:
       - https://github.com/mozilla-mobile/focus-ios/pull/3968
     notification_emails:
       - fx-ios-data-stewards@mozilla.com
-    expires: never
\ No newline at end of file
+    expires: never