MicrosoftDocs · ManikaDhiman · Sep 24, 2025 · Sep 24, 2025 · Sep 25, 2025
diff --git a/azure-local/deploy/deployment-azure-resource-manager-template.md b/azure-local/deploy/deployment-azure-resource-manager-template.md
@@ -43,74 +43,13 @@ Follow these steps to prepare the Azure resources you need for the deployment:
 
 ::: moniker range="<=azloc-24113"
 
-### Create a service principal and client secret
-
-To authenticate your system, you need to create a service principal and a corresponding **Client secret** for Arc Resource Bridge (ARB).
-
-### Create a service principal for ARB
-
-Follow the steps in [Create a Microsoft Entra application and service principal that can access resources via Azure portal](/entra/identity-platform/howto-create-service-principal-portal) to create the service principal and assign the roles. Alternatively, use the PowerShell procedure to [Create an Azure service principal with Azure PowerShell](/powershell/azure/create-azure-service-principal-azureps).
-
-The steps are also summarized here:
-
-1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com/) as at least a Cloud Application Administrator. Browse to **Identity > Applications > App registrations** then select **New registration**.
-
-1. Provide a **Name** for the application, select a **Supported account type**, and then select **Register**.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/create-service-principal-1a.png" alt-text="Screenshot showing Register an application for service principal creation." lightbox="./media/deployment-azure-resource-manager-template/create-service-principal-1a.png":::
-
-1. Once the service principal is created, go to the **Enterprise applications** page. Search for and select the SPN you created.
-
-   :::image type="content" source="./media/deployment-azure-resource-manager-template/create-service-principal-2a.png" alt-text="Screenshot showing search results for the service principal created." lightbox="./media/deployment-azure-resource-manager-template/create-service-principal-2a.png":::
-
-1. Under properties, copy the **Application (client) ID**  and the **Object ID** for this service principal.
-
-   :::image type="content" source="./media/deployment-azure-resource-manager-template/create-service-principal-2b.png" alt-text="Screenshot showing Application (client) ID and the object ID for the service principal created." lightbox="./media/deployment-azure-resource-manager-template/create-service-principal-2b.png":::
-
-    You use the **Application (client) ID** against the `arbDeploymentAppID` parameter and the **Object ID** against the `arbDeploymentSPNObjectID` parameter in the ARM template.
-
-### Create a client secret for ARB service principal
-
-1. Go to the application registration that you created and browse to **Certificates & secrets > Client secrets**.
-1. Select **+ New client** secret.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/create-client-secret-1.png" alt-text="Screenshot showing creation of a new client secret." lightbox="./media/deployment-azure-resource-manager-template/create-client-secret-1.png":::
-
-1. Add a **Description** for the client secret and provide a timeframe when it **Expires**. Select **Add**.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/create-client-secret-2.png" alt-text="Screenshot showing Add a client secret blade." lightbox="./media/deployment-azure-resource-manager-template/create-client-secret-2.png":::
-
-1. Copy the **client secret value** as you use it later.
-
-    > [!Note]
-    > For the application client ID, you will need it's secret value. Client secret values can't be viewed except for immediately after creation. Be sure to save this value when created before leaving the page.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/create-client-secret-3.png" alt-text="Screenshot showing client secret value." lightbox="./media/deployment-azure-resource-manager-template/create-client-secret-3.png":::
-
-    You use the **client secret value** against the `arbDeploymentAppSecret` parameter in the ARM.
+[!INCLUDE [create-service-principal-client-secret](../includes/create-service-principal-client-secret.md)]
 
 ::: moniker-end
 
-### Get the object ID for Azure Local Resource Provider
-
-This object ID for the Azure Local Resource Provide (RP) is unique per Azure tenant.
-
-1. In the Azure portal, search for and go to Microsoft Entra ID.  
-1. Go to the **Overview** tab and search for *Microsoft.AzureStackHCI Resource Provider*.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/search-azure-stackhci-resource-provider-1a.png" alt-text="Screenshot showing the search for the Azure Local Resource Provider service principal." lightbox="./media/deployment-azure-resource-manager-template/search-azure-stackhci-resource-provider-1a.png":::
-
-1. Select the Service Principal Name that is listed and copy the **Object ID**.
-
-    :::image type="content" source="./media/deployment-azure-resource-manager-template/get-azure-stackhci-object-id-1a.png" alt-text="Screenshot showing the object ID for the Azure Local Resource Provider service principal." lightbox="./media/deployment-azure-resource-manager-template/get-azure-stackhci-object-id-1a.png":::
-
-    Alternatively, you can use PowerShell to get the object ID of the Azure Local RP service principal. Run the following command in PowerShell:
-
-    ```powershell
-    Get-AzADServicePrincipal -DisplayName "Microsoft.AzureStackHCI Resource Provider"
-    ```
+[!INCLUDE [get-object-id-azure-local-resource-provider](../includes/get-object-id-azure-local-resource-provider.md)]
 
-    You use the **Object ID** against the `hciResourceProviderObjectID` parameter in the ARM template.
+You use the **Object ID** against the `hciResourceProviderObjectID` parameter in the ARM template.
 
 ## Step 2: Deploy using ARM template
 

diff --git a/...loy/media/deployment-azure-resource-manager-template/create-client-secret-1.png b/...loy/media/deployment-azure-resource-manager-template/create-client-secret-1.png
diff --git a/...loy/media/deployment-azure-resource-manager-template/create-client-secret-2.png b/...loy/media/deployment-azure-resource-manager-template/create-client-secret-2.png
diff --git a/...loy/media/deployment-azure-resource-manager-template/create-client-secret-3.png b/...loy/media/deployment-azure-resource-manager-template/create-client-secret-3.png
diff --git a/...edia/deployment-azure-resource-manager-template/create-service-principal-1a.png b/...edia/deployment-azure-resource-manager-template/create-service-principal-1a.png
diff --git a/...edia/deployment-azure-resource-manager-template/create-service-principal-2a.png b/...edia/deployment-azure-resource-manager-template/create-service-principal-2a.png
diff --git a/...edia/deployment-azure-resource-manager-template/create-service-principal-2b.png b/...edia/deployment-azure-resource-manager-template/create-service-principal-2b.png
diff --git a/.../deployment-azure-resource-manager-template/get-azure-stackhci-object-id-1a.png b/.../deployment-azure-resource-manager-template/get-azure-stackhci-object-id-1a.png
diff --git a/azure-local/includes/create-service-principal-client-secret.md b/azure-local/includes/create-service-principal-client-secret.md
@@ -0,0 +1,55 @@
+---
+author: alkohli
+ms.author: alkohli
+ms.service: azure-local
+ms.topic: include
+ms.date: 09/24/2025
+ms.reviewer: alkohli
+ms.lastreviewed: 09/24/2025
+---
+
+### Create a service principal and client secret
+
+To authenticate your system, you need to create a service principal and a corresponding **Client secret** for Arc Resource Bridge (ARB).
+
+#### Create a service principal for ARB
+
+Follow the steps in [Create a Microsoft Entra application and service principal that can access resources via Azure portal](/entra/identity-platform/howto-create-service-principal-portal) to create the service principal and assign the roles. Alternatively, use the PowerShell procedure to [Create an Azure service principal with Azure PowerShell](/powershell/azure/create-azure-service-principal-azureps).
+
+The steps are also summarized here:
+
+1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com/) as at least a Cloud Application Administrator. Browse to **Identity > Applications > App registrations** then select **New registration**.
+
+1. Provide a **Name** for the application, select a **Supported account type**, and then select **Register**.
+
+    :::image type="content" source="./media/create-service-principal-client-secret/create-service-principal-register.png" alt-text="Screenshot showing Register an application for service principal creation." lightbox="./media/create-service-principal-client-secret/create-service-principal-register.png":::
+
+1. Once the service principal is created, go to the **Enterprise applications** page. Search for and select the SPN you created.
+
+   :::image type="content" source="./media/create-service-principal-client-secret/create-service-principal-search.png" alt-text="Screenshot showing search results for the service principal created." lightbox="./media/create-service-principal-client-secret/create-service-principal-search.png":::
+
+1. Under properties, copy the **Application (client) ID**  and the **Object ID** for this service principal.
+
+   :::image type="content" source="./media/create-service-principal-client-secret/create-service-principal-id.png" alt-text="Screenshot showing Application (client) ID and the object ID for the service principal created." lightbox="./media/create-service-principal-client-secret/create-service-principal-id.png":::
+
+    You use the **Application (client) ID** against the `arbDeploymentAppID` parameter and the **Object ID** against the `arbDeploymentSPNObjectID` parameter in the Resource Manager template.
+
+#### Create a client secret for ARB service principal
+
+1. Go to the application registration that you created and browse to **Certificates & secrets > Client secrets**.
+1. Select **+ New client** secret.
+
+    :::image type="content" source="./media/create-service-principal-client-secret/create-client-secret-new.png" alt-text="Screenshot showing creation of a new client secret." lightbox="./media/create-service-principal-client-secret/create-client-secret-new.png":::
+
+1. Add a **Description** for the client secret and provide a timeframe when it **Expires**. Select **Add**.
+
+    :::image type="content" source="./media/create-service-principal-client-secret/create-client-secret-add.png" alt-text="Screenshot showing Add a client secret blade." lightbox="./media/create-service-principal-client-secret/create-client-secret-add.png":::
+
+1. Copy the **client secret value** as you use it later.
+
+    > [!Note]
+    > For the application client ID, you will need its secret value. Client secret values can't be viewed except for immediately after creation. Be sure to save this value when created before leaving the page.
+
+    :::image type="content" source="./media/create-service-principal-client-secret/create-client-secret-value.png" alt-text="Screenshot showing client secret value." lightbox="./media/create-service-principal-client-secret/create-client-secret-value.png":::
+
+    You use the **client secret value** against the `arbDeploymentAppSecret` parameter in the ARM template.
diff --git a/azure-local/includes/get-object-id-azure-local-resource-provider.md b/azure-local/includes/get-object-id-azure-local-resource-provider.md
@@ -0,0 +1,28 @@
+---
+author: alkohli
+ms.author: alkohli
+ms.service: azure-local
+ms.topic: include
+ms.date: 09/24/2025
+ms.reviewer: alkohli
+ms.lastreviewed: 09/24/2025
+---
+
+### Get the object ID for Azure Local Resource Provider
+
+This object ID for the Azure Local Resource Provider (RP) is unique per Azure tenant.
+
+1. In the Azure portal, search for and go to Microsoft Entra ID.  
+1. Go to the **Overview** tab and search for *Microsoft.AzureStackHCI Resource Provider*.
+
+    :::image type="content" source="./media/get-object-id-azure-local-resource-provider/search-resource-provider.png" alt-text="Screenshot showing the search for the Azure Local Resource Provider service principal." lightbox="./media/get-object-id-azure-local-resource-provider/search-resource-provider.png":::
+
+1. Select the Service Principal Name that is listed and copy the **Object ID**.
+
+    :::image type="content" source="./media/get-object-id-azure-local-resource-provider/get-object-id.png" alt-text="Screenshot showing the object ID for the Azure Local Resource Provider service principal." lightbox="./media/get-object-id-azure-local-resource-provider/get-object-id.png":::
+
+    Alternatively, you can use PowerShell to get the object ID of the Azure Local RP service principal. Run the following command in PowerShell:
+
+    ```powershell
+    Get-AzADServicePrincipal -DisplayName "Microsoft.AzureStackHCI Resource Provider"
+    ```
diff --git a/...ger-template/create-client-secret-add.png → ...lient-secret/create-client-secret-add.png b/...ger-template/create-client-secret-add.png → ...lient-secret/create-client-secret-add.png
diff --git a/...ger-template/create-client-secret-new.png → ...lient-secret/create-client-secret-new.png b/...ger-template/create-client-secret-new.png → ...lient-secret/create-client-secret-new.png
diff --git a/...r-template/create-client-secret-value.png → ...ent-secret/create-client-secret-value.png b/...r-template/create-client-secret-value.png → ...ent-secret/create-client-secret-value.png
diff --git a/...-template/create-service-principal-id.png → ...nt-secret/create-service-principal-id.png b/...-template/create-service-principal-id.png → ...nt-secret/create-service-principal-id.png
diff --git a/...ate/create-service-principal-register.png → ...ret/create-service-principal-register.png b/...ate/create-service-principal-register.png → ...ret/create-service-principal-register.png
diff --git a/...plate/create-service-principal-search.png → ...ecret/create-service-principal-search.png b/...plate/create-service-principal-search.png → ...ecret/create-service-principal-search.png
diff --git a/...source-manager-template/get-object-id.png → ...local-resource-provider/get-object-id.png b/...source-manager-template/get-object-id.png → ...local-resource-provider/get-object-id.png
diff --git a/...h-azure-stackhci-resource-provider-1a.png → ...rce-provider/search-resource-provider.png b/...h-azure-stackhci-resource-provider-1a.png → ...rce-provider/search-resource-provider.png
diff --git a/azure-local/upgrade/install-solution-upgrade-azure-resource-manager-template.md b/azure-local/upgrade/install-solution-upgrade-azure-resource-manager-template.md
@@ -3,7 +3,7 @@ title: Install solution upgrade on Azure Local using Azure Resource Manager temp
 description: Learn how to install the solution upgrade on your Azure Local instance using Azure Resource Manager template.
 author: alkohli
 ms.topic: how-to
-ms.date: 08/25/2025
+ms.date: 09/24/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -14,14 +14,16 @@ ms.service: azure-local
 
 [!INCLUDE [applies-to](../includes/hci-applies-to-23h2-22h2.md)]
 
-[!INCLUDE [end-of-service-22H2](../includes/end-of-service-22h2.md)]
-
 This article describes how to install the solution upgrade on your Azure Local instance using Azure Resource Manager (ARM) template, after upgrading the operating system (OS) build from 20349.xxxx (22H2) to 25398.xxxx (23H2).
 
 > [!IMPORTANT]
 > - While the OS upgrade is generally available, the solution upgrade is rolled out in phases. Additionally, the solution upgrade isn't available to customers in Azure China.
 > - Installing solution upgrade using ARM template is targeted for at-scale upgrades. This method is intended for IT administrators who have experience managing Azure Local instances. We recommend that you upgrade a system via the Azure portal first, and then use ARM template for subsequent upgrades. To install the solution upgrade via the Azure portal, see [Install solution upgrade on Azure Local](./install-solution-upgrade.md).
 
+## About End of Support (EOS) for version 22H2
+
+[!INCLUDE [end-of-service-22H2](../includes/end-of-service-22h2.md)]
+
 ## Prerequisites
 
 Before you install the solution upgrade, make sure that you:
@@ -61,74 +63,13 @@ Follow these steps to prepare the Azure resources you need for the upgrade:
 
 ::: moniker range="<=azloc-24113"
 
-### Create a service principal and client secret
-
-To authenticate your system, you need to create a service principal and a corresponding **Client secret** for Arc Resource Bridge (ARB).
-
-### Create a service principal for ARB
-
-Follow the steps in [Create a Microsoft Entra application and service principal that can access resources via Azure portal](/entra/identity-platform/howto-create-service-principal-portal) to create the service principal and assign the roles. Alternatively, use the PowerShell procedure to [Create an Azure service principal with Azure PowerShell](/powershell/azure/create-azure-service-principal-azureps).
-
-The steps are also summarized here:
-
-1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com/) as at least a Cloud Application Administrator. Browse to **Identity > Applications > App registrations** then select **New registration**.
-
-1. Provide a **Name** for the application, select a **Supported account type**, and then select **Register**.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-register.png" alt-text="Screenshot showing Register an application for service principal creation." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-register.png":::
-
-1. Once the service principal is created, go to the **Enterprise applications** page. Search for and select the SPN you created.
-
-   :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-search.png" alt-text="Screenshot showing search results for the service principal created." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-search.png":::
-
-1. Under properties, copy the **Application (client) ID**  and the **Object ID** for this service principal.
-
-   :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-id.png" alt-text="Screenshot showing Application (client) ID and the object ID for the service principal created." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-service-principal-id.png":::
-
-    You use the **Application (client) ID** against the `arbDeploymentAppID` parameter and the **Object ID** against the `arbDeploymentSPNObjectID` parameter in the Resource Manager template.
-
-### Create a client secret for ARB service principal
-
-1. Go to the application registration that you created and browse to **Certificates & secrets > Client secrets**.
-1. Select **+ New client** secret.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-new.png" alt-text="Screenshot showing creation of a new client secret." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-new.png":::
-
-1. Add a **Description** for the client secret and provide a timeframe when it **Expires**. Select **Add**.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-add.png" alt-text="Screenshot showing Add a client secret blade." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-add.png":::
-
-1. Copy the **client secret value** as you use it later.
-
-    > [!Note]
-    > For the application client ID, you will need it's secret value. Client secret values can't be viewed except for immediately after creation. Be sure to save this value when created before leaving the page.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-value.png" alt-text="Screenshot showing client secret value." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/create-client-secret-value.png":::
-
-    You use the **client secret value** against the `arbDeploymentAppSecret` parameter in the Resource Manager template.
+[!INCLUDE [create-service-principal-client-secret](../includes/create-service-principal-client-secret.md)]
 
 ::: moniker-end
 
-### Get the object ID for Azure Local Resource Provider
-
-This object ID for the Azure Local Resource Provide (RP) is unique per Azure tenant.
-
-1. In the Azure portal, search for and go to Microsoft Entra ID.  
-1. Go to the **Overview** tab and search for *Microsoft.AzureStackHCI Resource Provider*.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/search-resource-provider-overview.png" alt-text="Screenshot showing the search for the Azure Local Resource Provider service principal." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/search-resource-provider-overview.png":::
-
-1. Select the Service Principal Name that is listed and copy the **Object ID**.
-
-    :::image type="content" source="./media/install-solution-upgrade-azure-resource-manager-template/get-object-id.png" alt-text="Screenshot showing the object ID for the Azure Local Resource Provider service principal." lightbox="./media/install-solution-upgrade-azure-resource-manager-template/get-object-id.png":::
-
-    Alternatively, you can use PowerShell to get the object ID of the Azure Local RP service principal. Run the following command in PowerShell:
-
-    ```powershell
-    Get-AzADServicePrincipal -DisplayName "Microsoft.AzureStackHCI Resource Provider"
-    ```
+[!INCLUDE [get-object-id-azure-local-resource-provider](../includes/get-object-id-azure-local-resource-provider.md)]
 
-## Install the solution upgrade using Azure Resource Manager template
+## Step 2: Install the solution upgrade using Azure Resource Manager template
 
 An ARM template creates and assigns all the resource permissions required for the upgrade.
 With all the prerequisite and preparation steps complete, you're ready to upgrade using a known good and tested ARM template and corresponding parameters JSON file. Use the parameters contained in the JSON file to fill out all values, including the values generated previously.

diff --git a/...n-upgrade-azure-resource-manager-template/search-resource-provider-overview.png b/...n-upgrade-azure-resource-manager-template/search-resource-provider-overview.png