diff --git a/windows/privacy/required-windows-diagnostic-data-events-and-fields-2004.md b/windows/privacy/required-windows-diagnostic-data-events-and-fields-2004.md
index c336dba245..a2da4f8863 100644
--- a/windows/privacy/required-windows-diagnostic-data-events-and-fields-2004.md
+++ b/windows/privacy/required-windows-diagnostic-data-events-and-fields-2004.md
@@ -1,6 +1,6 @@
 ---
 description: Learn more about the required Windows 10 diagnostic data gathered.
-title: Required diagnostic events and fields for Windows 10 (versions 22H2, 21H2, 21H1, 20H2, and 2004)
+title: Required diagnostic events and fields for Windows 10, versions 22H2 and 21H2
 ms.service: windows-client
 ms.subservice: itpro-privacy
 ms.localizationpriority: high
@@ -13,16 +13,15 @@ ms.topic: reference
 ---
 
 
-# Required diagnostic events and fields for Windows 10: versions 22H2, 21H2, 21H1, 20H2, and 2004
+# Required diagnostic events and fields for Windows 10, versions 22H2 and 21H2
 
  **Applies to**
 
 - Windows 10, version 22H2
 - Windows 10, version 21H2
-- Windows 10, version 21H1
-- Windows 10, version 20H2
-- Windows 10, version 2004
 
+> [!NOTE]
+> The information in this article also applies to these versions of Windows 10: 21H1, 20H2, and 2004. But those versions have reached their end of servicing date. For more information, see [Microsoft Product Lifecycle](/lifecycle/products).
 
 Required diagnostic data gathers a limited set of information that is critical for understanding the device and its configuration including: basic device information, quality-related information, app compatibility, and Microsoft Store.
 
diff --git a/windows/privacy/toc.yml b/windows/privacy/toc.yml
index 8d18cdd2dc..5ec34034d8 100644
--- a/windows/privacy/toc.yml
+++ b/windows/privacy/toc.yml
@@ -19,13 +19,13 @@
           href: required-diagnostic-events-fields-windows-11-22H2.md
         - name: Windows 11, version 21H2
           href: required-windows-11-diagnostic-events-and-fields.md
-        - name: Windows 10, versions 22H2, 21H2, 21H1, 20H2, and 2004
+        - name: Windows 10, versions 22H2 and 21H2
           href: required-windows-diagnostic-data-events-and-fields-2004.md
         - name: Windows 10, version 1809
           href: basic-level-windows-diagnostic-events-and-fields-1809.md
-    - name: Optional Windows diagnostic data events and fields
+    - name: Optional Windows diagnostic data
       items:
-        - name: Windows 10, version 1709 and later and Windows 11 optional diagnostic data
+        - name: Optional diagnostic data for Windows 11 and Windows 10
           href: windows-diagnostic-data.md
     - name: Manage Windows connected experiences
       items: 
diff --git a/windows/privacy/windows-diagnostic-data.md b/windows/privacy/windows-diagnostic-data.md
index 44ea57dcd1..6b1643a86d 100644
--- a/windows/privacy/windows-diagnostic-data.md
+++ b/windows/privacy/windows-diagnostic-data.md
@@ -1,5 +1,5 @@
 ---
-title: Windows 10, version 1709 and Windows 11 and later optional diagnostic data (Windows 10)
+title: Optional diagnostic data for Windows 11 and Windows 10
 description: Use this article to learn about the types of optional diagnostic data that is collected.
 ms.service: windows-client
 ms.subservice: itpro-privacy
@@ -12,7 +12,7 @@ ms.collection: highpri
 ms.topic: reference
 ---
 
-# Windows 10, version 1709 and later and Windows 11 optional diagnostic data
+# Optional diagnostic data for Windows 11 and Windows 10
 
 Applies to:
 - Windows 11, version 23H2
@@ -20,14 +20,10 @@ Applies to:
 - Windows 11, version 21H2
 - Windows 10, version 22H2
 - Windows 10, version 21H2
-- Windows 10, version 21H1
-- Windows 10, version 20H2
-- Windows 10, version 2004
-- Windows 10, version 1909
-- Windows 10, version 1903
 - Windows 10, version 1809
-- Windows 10, version 1803
-- Windows 10, version 1709
+
+> [!NOTE]
+> The information in this article also applies to these versions of Windows 10: 21H1, 20H2, 2004, 1909, 1903, 1803, and 1709. But those versions have reached their end of servicing date. For more information, see [Microsoft Product Lifecycle](/lifecycle/products).
 
 Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of optional diagnostic data collected by Windows, with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 11 required diagnostic events and fields](/windows/privacy/required-windows-11-diagnostic-events-and-fields).