Draft in progress.

Author: johnmarco

articles/azure-arc/servers/media/onboard-windows-server/arcsetup-remove.png

@@ -1,7 +1,7 @@
 ---
 title: Connect Windows Server machines to Azure through Azure Arc Setup
 description: In this article, you learn how to connect Windows Server machines to Azure Arc using the built-in Windows Server Azure Arc Setup wizard.
-ms.date: 10/12/2023
+ms.date: 03/26/2024
 ms.topic: conceptual
 ---
 
@@ -11,8 +11,11 @@ Windows Server machines can be onboarded directly to [Azure Arc](https://azure.m
 
 Onboarding to Azure Arc is not needed if the Windows Server machine is already running in Azure.
 
+For Windows Server 2025 and later, Azure Arc Setup is a Feature on Demand (FOD), rather than an optional component (as it is for Windows Server 2022). Essentially, this means that the procedures for removal and enablement differ between OS versions. See [Features On Demand](/windows-hardware/manufacture/desktop/features-on-demand-v2--capabilities?view=windows-11) for more information.
+
+
 > [!NOTE]
-> This feature only applies to Windows Server 2022 and later. It was released in the [Cumulative Update of 10/10/2023](https://support.microsoft.com/en-us/topic/october-10-2023-kb5031364-os-build-20348-2031-7f1d69e7-c468-4566-887a-1902af791bbc).
+> The Azure Arc Setup feature only applies to Windows Server 2022 and later. It was released in the [Cumulative Update of 10/10/2023](https://support.microsoft.com/en-us/topic/october-10-2023-kb5031364-os-build-20348-2031-7f1d69e7-c468-4566-887a-1902af791bbc).
 > 
 ## Prerequisites
 
@@ -67,7 +70,10 @@ The Azure Arc system tray icon at the bottom of your Windows Server machine indi
 
 ## Uninstalling Azure Arc Setup
 
-To uninstall Azure Arc Setup, follow these steps:
+> [!NOTE]
+> Uninstalling Azure Arc Setup does not uninstall the Azure Connected Machine agent from the machine. For instructions on uninstalling the agent, see [Managing and maintaining the Connected Machine agent](manage-agent.md).
+>
+To uninstall Azure Arc Setup from a Windows Server 2022 machine:
 
 1. In the Server Manager, navigate to the **Remove Roles and Features Wizard**. (See [Remove roles, role services, and features by using the remove Roles and Features Wizard](/windows-server/administration/server-manager/install-or-uninstall-roles-role-services-or-features#remove-roles-role-services-and-features-by-using-the-remove-roles-and-features-wizard) for more information.)
 
@@ -81,9 +87,13 @@ To uninstall Azure Arc Setup through PowerShell, run the following command:
 Disable-WindowsOptionalFeature -Online -FeatureName AzureArcSetup
 ```
 
-> [!NOTE]
-> Uninstalling Azure Arc Setup does not uninstall the Azure Connected Machine agent from the machine. For instructions on uninstalling the agent, see [Managing and maintaining the Connected Machine agent](manage-agent.md).
->
+To uninstall Azure Arc Setup from a Windows Server 2025 machine:
+
+1. Open the Settings app on the machine and select **System**, then select **Optional features**.
+
+1. Select **AzureArcSetup**, and then select **Remove**.
+
+:::image type="content" source="media/onboard-windows-server/arcsetup-remove.png" alt-text="Screenshot of Optional feature menu showing Azure Arc Setup feature with Remove button.":::
 
 ## Next steps