diff --git a/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
index 49d00a03bf..6542f4aa17 100644
--- a/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
+++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
@@ -1,7 +1,7 @@
---
title: Policies in Policy CSP supported by Group Policy
description: Learn about the policies in Policy CSP supported by Group Policy.
-ms.date: 04/10/2024
+ms.date: 04/23/2024
---
@@ -871,7 +871,6 @@ This article lists the policies in Policy CSP that have a group policy mapping.
## WindowsAI
- [TurnOffWindowsCopilot](policy-csp-windowsai.md)
-- [DisableAIDataAnalysis](policy-csp-windowsai.md)
## WindowsDefenderSecurityCenter
diff --git a/windows/client-management/mdm/policy-csp-windowsai.md b/windows/client-management/mdm/policy-csp-windowsai.md
index aa027def07..7f0e55df51 100644
--- a/windows/client-management/mdm/policy-csp-windowsai.md
+++ b/windows/client-management/mdm/policy-csp-windowsai.md
@@ -1,7 +1,7 @@
---
title: WindowsAI Policy CSP
description: Learn more about the WindowsAI Area in Policy CSP.
-ms.date: 01/31/2024
+ms.date: 04/23/2024
---
@@ -9,74 +9,10 @@ ms.date: 01/31/2024
# Policy CSP - WindowsAI
-[!INCLUDE [Windows Insider tip](includes/mdm-insider-csp-note.md)]
-
-
-## DisableAIDataAnalysis
-
-
-| Scope | Editions | Applicable OS |
-|:--|:--|:--|
-| ❌ Device
✅ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview [99.9.9999] |
-
-
-
-```User
-./User/Vendor/MSFT/Policy/Config/WindowsAI/DisableAIDataAnalysis
-```
-
-
-
-
-This policy setting allows you to prevent Windows AI from using and analyzing user patterns and data.
-
-- If you enable this policy setting, Windows AI won't be able to take advantage of historical user patterns.
-
-- If you disable or don't configure this policy setting, Windows AI will be able to assist users by considering their historical behaviors and data.
-
-
-
-
-
-
-
-**Description framework properties**:
-
-| Property name | Property value |
-|:--|:--|
-| Format | `int` |
-| Access Type | Add, Delete, Get, Replace |
-| Default Value | 0 |
-
-
-
-**Allowed values**:
-
-| Value | Description |
-|:--|:--|
-| 0 (Default) | Enable Data Analysis for Windows AI. |
-| 1 | Disable Data Analysis for Windows AI. |
-
-
-
-**Group policy mapping**:
-
-| Name | Value |
-|:--|:--|
-| Name | DisableAIDataAnalysis |
-| Path | WindowsAI > AT > WindowsComponents > WindowsAI |
-
-
-
-
-
-
-
-
## TurnOffWindowsCopilot
diff --git a/windows/client-management/mdm/surfacehub-csp.md b/windows/client-management/mdm/surfacehub-csp.md
index 553037a410..78f6dd37b7 100644
--- a/windows/client-management/mdm/surfacehub-csp.md
+++ b/windows/client-management/mdm/surfacehub-csp.md
@@ -1,7 +1,7 @@
---
title: SurfaceHub CSP
description: Learn more about the SurfaceHub CSP.
-ms.date: 01/18/2024
+ms.date: 04/22/2024
---
@@ -65,6 +65,10 @@ The following list shows the SurfaceHub configuration service provider nodes:
- [MOMAgent](#momagent)
- [WorkspaceID](#momagentworkspaceid)
- [WorkspaceKey](#momagentworkspacekey)
+ - [MOMAgentGovtCloud](#momagentgovtcloud)
+ - [AzureCloudIndexGovtCloud](#momagentgovtcloudazurecloudindexgovtcloud)
+ - [WorkspaceIDGovtCloud](#momagentgovtcloudworkspaceidgovtcloud)
+ - [WorkspaceKeyGovtCloud](#momagentgovtcloudworkspacekeygovtcloud)
- [Properties](#properties)
- [AllowAutoProxyAuth](#propertiesallowautoproxyauth)
- [AllowSessionResume](#propertiesallowsessionresume)
@@ -2011,6 +2015,162 @@ Primary key for authenticating with workspace. Will always return an empty strin
+
+## MOMAgentGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud
+```
+
+
+
+
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `node` |
+| Access Type | Get |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/AzureCloudIndexGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/AzureCloudIndexGovtCloud
+```
+
+
+
+
+Enum value for Azure Clouds supported for OMS tracking in SurfaceHub.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Get, Replace |
+| Default Value | 0 |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/WorkspaceIDGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/WorkspaceIDGovtCloud
+```
+
+
+
+
+GUID identifying the Microsoft Operations Management Suite workspace ID to collect the data for Govt Clouds. Set this to an empty string to disable the MOM agent.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `chr` (string) |
+| Access Type | Get, Replace |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/WorkspaceKeyGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/WorkspaceKeyGovtCloud
+```
+
+
+
+
+Primary key for authenticating with workspace for Govt Clouds. Will always return an empty string.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `chr` (string) |
+| Access Type | Get, Replace |
+
+
+
+
+
+
+
+
## Properties
diff --git a/windows/client-management/mdm/surfacehub-ddf-file.md b/windows/client-management/mdm/surfacehub-ddf-file.md
index 4bfee13fce..3222bade2d 100644
--- a/windows/client-management/mdm/surfacehub-ddf-file.md
+++ b/windows/client-management/mdm/surfacehub-ddf-file.md
@@ -1,7 +1,7 @@
---
title: SurfaceHub DDF file
description: View the XML file containing the device description framework (DDF) for the SurfaceHub configuration service provider.
-ms.date: 01/18/2024
+ms.date: 04/22/2024
---
@@ -12,11 +12,10 @@ The following XML file contains the device description framework (DDF) for the S
```xml
-]>
+
1.2
-
-
+
SurfaceHub
./Vendor/MSFT
@@ -86,8 +85,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -110,8 +108,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -134,8 +131,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -158,8 +154,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -203,8 +198,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -227,8 +221,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -251,8 +244,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -534,8 +526,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.15063
1.0
-
-
+
@@ -611,8 +602,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -753,8 +743,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -982,8 +971,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1028,8 +1016,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1522,8 +1509,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.15063, 10.0.14393.969
1.0
-
-
+
@@ -1584,8 +1570,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1633,8 +1618,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1657,8 +1641,99 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
+
+
+
+
+ MOMAgentGovtCloud
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10.0.19045.4355
+ 1.0
+ 0x4;0x1B;0x30;0x31;0x48;0x54;0x62;0x63;0x64;0x65;0x77;0x79;0x7A;0x7D;0x7E;0x81;0x82;0x8A;0x8B;0xA1;0xA2;0xA4;0xA5;0xAB;0xAC;0xAF;0xB4;0xBC;0xBF;0xCA;0xCB;0xCD;
+
+
+
+ WorkspaceIDGovtCloud
+
+
+
+
+
+ GUID identifying the Microsoft Operations Management Suite workspace ID to collect the data for Govt Clouds. Set this to an empty string to disable the MOM agent.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ WorkspaceKeyGovtCloud
+
+
+
+
+
+ Primary key for authenticating with workspace for Govt Clouds.. Will always return an empty string.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ AzureCloudIndexGovtCloud
+
+
+
+
+
+ 0
+ Enum value for Azure Clouds supported for OMS tracking in SurfaceHub.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
@@ -1702,8 +1777,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1726,8 +1800,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1754,8 +1827,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.17134, 10.0.16299.64
1.0
-
-
+
LanProfile
@@ -1777,8 +1849,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1801,8 +1872,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+