--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -5968,32 +5968,34 @@
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
     "description": "Firefox: Time in ms spent updating UI in response to a tab switch"
   },
   "FX_TAB_SWITCH_TOTAL_MS": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "56",
+    "record_in_processes": ["main"],
+    "alert_emails": ["mconley@mozilla.com"],
+    "expires_in_version": "57",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
     "releaseChannelCollection": "opt-out",
-    "description": "Firefox: Time in ms till a tab switch is complete including the first paint"
+    "description": "Firefox: Time in ms till a tab switch is complete including the first paint for non-e10s windows"
   },
   "FX_TAB_SWITCH_TOTAL_E10S_MS": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "56",
+    "record_in_processes": ["main"],
+    "alert_emails": ["mconley@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
     "releaseChannelCollection": "opt-out",
-    "description": "Firefox: Time in ms between tab selection and tab content paint."
+    "description": "Firefox: Time in ms between tab selection and tab content paint in e10s windows"
   },
   "FX_TAB_SWITCH_SPINNER_VISIBLE_MS": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "63",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
     "releaseChannelCollection": "opt-out",
@@ -13055,20 +13057,20 @@
     "releaseChannelCollection": "opt-out",
     "expires_in_version": "56",
     "kind": "linear",
     "high": 300000,
     "n_buckets": 30,
     "description": "Time in MS that content is narrated in 10 second increments up to 5 minutes"
   },
   "TABCHILD_PAINT_TIME": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["content"],
     "alert_emails": ["mconley@mozilla.com"],
     "bug_numbers": [1313686],
-    "expires_in_version": "56",
+    "expires_in_version": "60",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
     "description": "Time spent painting the contents of a remote browser (ms).",
     "releaseChannelCollection": "opt-out"
   },
   "TIME_TO_NON_BLANK_PAINT_MS": {
     "record_in_processes": ["main", "content"],